|
 |
5dd4b2 |
diff -up nss/lib/softoken/sdb.c.fs-probe nss/lib/softoken/sdb.c
|
|
|
5dd4b2 |
--- nss/lib/softoken/sdb.c.fs-probe 2019-05-10 23:14:18.000000000 +0200
|
|
|
5dd4b2 |
+++ nss/lib/softoken/sdb.c 2019-05-16 13:26:17.898377555 +0200
|
|
|
5dd4b2 |
@@ -1954,7 +1954,7 @@ sdb_init(char *dbname, char *table, sdbD
|
|
|
5dd4b2 |
/* By default, with no variable set, we avoid expensive measuring for
|
|
|
5dd4b2 |
* most FS types. We start with inexpensive FS type checking, and
|
|
|
5dd4b2 |
* might perform measuring for some types. */
|
|
|
5dd4b2 |
- checkFSType = PR_TRUE;
|
|
|
5dd4b2 |
+ measureSpeed = PR_TRUE;
|
|
|
5dd4b2 |
} else if (PORT_Strcasecmp(env, "yes") == 0) {
|
|
|
358035 |
enableCache = PR_TRUE;
|
|
|
5dd4b2 |
} else if (PORT_Strcasecmp(env, "no") != 0) { /* not "no" => "auto" */
|
|
|
5dd4b2 |
@@ -2135,8 +2135,8 @@ s_open(const char *directory, const char
|
|
|
5dd4b2 |
/* If the environment variable is undefined or set to yes or no,
|
|
|
5dd4b2 |
* sdb_init() will ignore the value of accessOps, and we can skip the
|
|
|
5dd4b2 |
* measuring.*/
|
|
|
5dd4b2 |
- if (env && PORT_Strcasecmp(env, "no") != 0 &&
|
|
|
5dd4b2 |
- PORT_Strcasecmp(env, "yes") != 0) {
|
|
|
5dd4b2 |
+ if (!env || (PORT_Strcasecmp(env, "no") != 0 &&
|
|
|
5dd4b2 |
+ PORT_Strcasecmp(env, "yes") != 0)) {
|
|
|
358035 |
accessOps = sdb_measureAccess(directory);
|
|
|
358035 |
}
|
|
|
358035 |
}
|