mozilla-shared-nss-db.patch
changeset 357 db07eb421d6b
parent 356 30a00f382aed
child 367 3fabd9f66322
equal deleted inserted replaced
356:30a00f382aed 357:db07eb421d6b
   124 +#ifdef MOZ_ENABLE_NSSHELPER
   124 +#ifdef MOZ_ENABLE_NSSHELPER
   125 +    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
   125 +    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
   126 +      init_rv = ::NSS_Initialize(profileStr.get(), "", "",
   126 +      init_rv = ::NSS_Initialize(profileStr.get(), "", "",
   127 +                                 SECMOD_DB, init_flags);
   127 +                                 SECMOD_DB, init_flags);
   128 +    } else {
   128 +    } else {
   129 +      init_rv = ::nsshelp_open_db ("mozilla-xul", profileStr.get(), init_flags);
   129 +      init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_flags);
   130 +
   130 +
   131 +      if (init_rv != SECSuccess) {
   131 +      if (init_rv != SECSuccess) {
   132 +        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
   132 +        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
   133 +        init_rv = ::NSS_Initialize(profileStr.get(), "", "",
   133 +        init_rv = ::NSS_Initialize(profileStr.get(), "", "",
   134 +                                   SECMOD_DB, init_flags);
   134 +                                   SECMOD_DB, init_flags);