e376fcdfbc
This back out fixes XML-based files open of misc/libreoffice. The problem is reported by Mustafa Dogan via private e-mail.
20 lines
682 B
C
20 lines
682 B
C
$NetBSD: patch-nss_lib_util_utilpars.c,v 1.1 2018/02/24 11:35:48 ryoon Exp $
|
|
|
|
Revert Bug 1377940 to fix misc/libreoffice
|
|
|
|
--- nss/lib/util/utilpars.c.orig 2018-01-18 14:19:59.000000000 +0000
|
|
+++ nss/lib/util/utilpars.c
|
|
@@ -1111,8 +1111,12 @@ _NSSUTIL_EvaluateConfigDir(const char *c
|
|
NSSDBType dbType;
|
|
PRBool checkEnvDefaultDB = PR_FALSE;
|
|
*appName = NULL;
|
|
- /* force the default */
|
|
+/* force the default */
|
|
+#ifdef NSS_DISABLE_DBM
|
|
dbType = NSS_DB_TYPE_SQL;
|
|
+#else
|
|
+ dbType = NSS_DB_TYPE_LEGACY;
|
|
+#endif
|
|
if (configdir == NULL) {
|
|
checkEnvDefaultDB = PR_TRUE;
|
|
} else if (PORT_Strncmp(configdir, MULTIACCESS, sizeof(MULTIACCESS) - 1) == 0) {
|