diff -up nss/lib/util/utilpars.c.nosqldb nss/lib/util/utilpars.c --- nss/lib/util/utilpars.c.nosqldb 2012-11-16 20:33:59.000000000 -0500 +++ nss/lib/util/utilpars.c 2013-04-12 21:00:32.096000522 -0400 @@ -1025,9 +1025,6 @@ _NSSUTIL_EvaluateConfigDir(const char *c cdir++; } configdir = cdir; - } else if (PORT_Strncmp(configdir, SQLDB, sizeof(SQLDB)-1) == 0) { - dbType = NSS_DB_TYPE_SQL; - configdir = configdir + sizeof(SQLDB) -1; } else if (PORT_Strncmp(configdir, EXTERNDB, sizeof(EXTERNDB)-1) == 0) { dbType = NSS_DB_TYPE_EXTERN; configdir = configdir + sizeof(EXTERNDB) -1; @@ -1038,9 +1035,7 @@ _NSSUTIL_EvaluateConfigDir(const char *c /* look up the default from the environment */ char *defaultType = PR_GetEnv("NSS_DEFAULT_DB_TYPE"); if (defaultType != NULL) { - if (PORT_Strncmp(defaultType, SQLDB, sizeof(SQLDB)-2) == 0) { - dbType = NSS_DB_TYPE_SQL; - } else if (PORT_Strncmp(defaultType,EXTERNDB,sizeof(EXTERNDB)-2)==0) { + if (PORT_Strncmp(defaultType,EXTERNDB,sizeof(EXTERNDB)-2)==0) { dbType = NSS_DB_TYPE_EXTERN; } else if (PORT_Strncmp(defaultType, LEGACY, sizeof(LEGACY)-2) == 0) { dbType = NSS_DB_TYPE_LEGACY;