[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 80/156: 211139

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 4d3a405ce4547282a6af76718a1a36ea5122c6bf
Author: rcritten <>
Date:   Tue Oct 17 16:45:57 2006 +0000

    211139
    
    Only call NSS_Shutdown when we've initialized the database.
    Also update the NSS log messages to those added in NSS 3.11.3.
---
 nss_engine_init.c | 15 +++++++++------
 nss_engine_log.c  | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/nss_engine_init.c b/nss_engine_init.c
index 6e588d5..1e5bed9 100644
--- a/nss_engine_init.c
+++ b/nss_engine_init.c
@@ -1019,7 +1019,7 @@ apr_status_t nss_init_ModuleKill(void *data)
     server_rec *base_server = (server_rec *)data;
     server_rec *s;
     SECStatus rv;
-    int shutdowncache = 0;
+    int shutdown = 0;
 
     /*
      * Free the non-pool allocated structures
@@ -1044,7 +1044,7 @@ apr_status_t nss_init_ModuleKill(void *data)
              * and keys associated with any SSL socket */
             PR_Close(sc->server->model);
 
-            shutdowncache = 1;
+            shutdown = 1;
         }
         if (sc->proxy_enabled) {
             if (sc->proxy->servercert != NULL) {
@@ -1055,15 +1055,18 @@ apr_status_t nss_init_ModuleKill(void *data)
             /* Closing this implicitly cleans up the copy of the certificates
              * and keys associated with any SSL socket */
             PR_Close(sc->proxy->model);
+
+            shutdown = 1;
         }
     }
 
-    if (shutdowncache) 
+    if (shutdown) {
         SSL_ShutdownServerSessionIDCache();
 
-    if ((rv = NSS_Shutdown()) != SECSuccess) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-             "NSS_Shutdown failed: %d", PR_GetError());
+        if ((rv = NSS_Shutdown()) != SECSuccess) {
+            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+                 "NSS_Shutdown failed: %d", PR_GetError());
+        }
     }
 
     return APR_SUCCESS;
diff --git a/nss_engine_log.c b/nss_engine_log.c
index ca68d18..f9f0ee3 100644
--- a/nss_engine_log.c
+++ b/nss_engine_log.c
@@ -25,7 +25,7 @@
 #define NSPR_ERROR_BASE			PR_NSPR_ERROR_BASE
 #define NSPR_MAX_ERROR			(PR_MAX_ERROR - 1)
 #define LIBSEC_ERROR_BASE		(-8192)
-#define LIBSEC_MAX_ERROR		(LIBSEC_ERROR_BASE + 144)
+#define LIBSEC_MAX_ERROR		(LIBSEC_ERROR_BASE + 155)
 #define LIBSSL_ERROR_BASE		(-12288)
 #define LIBSSL_MAX_ERROR		(LIBSSL_ERROR_BASE + 102)
 
@@ -179,7 +179,18 @@ l_error_t libsec_errors[] = {
     { 141, "SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE" },
     { 142, "SEC_ERROR_UNSUPPORTED_EC_POINT_FORM" },
     { 143, "SEC_ERROR_UNRECOGNIZED_OID" },
-    { 144, "SEC_ERROR_OCSP_INVALID_SIGNING_CERT - OCSP signer certificate not found, not trusted or invalid." }
+    { 144, "SEC_ERROR_OCSP_INVALID_SIGNING_CERT - OCSP signer certificate not found, not trusted or invalid." },
+    { 145, "SEC_ERROR_REVOKED_CERTIFICATE_CRL - This certificate has been revoked." },
+    { 146, "SEC_ERROR_REVOKED_CERTIFICATE_OCSP - This certificate has been revoked." },
+    { 147, "SEC_ERROR_CRL_INVALID_VERSION" },
+    { 148, "SEC_ERROR_CRL_V1_CRITICAL_EXTENSION" },
+    { 149, "SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION" },
+    { 150, "SEC_ERROR_UNKNOWN_OBJECT_TYPE" },
+    { 151, "SEC_ERROR_INCOMPATIBLE_PKCS11" },
+    { 152, "SEC_ERROR_NO_EVENT" },
+    { 153, "SEC_ERROR_CRL_ALREADY_EXISTS" },
+    { 154, "SEC_ERROR_NOT_INITIALIZED" },
+    { 155, "SEC_ERROR_TOKEN_NOT_LOGGED_IN" }
 };
 
 l_error_t libnss_errors[] = {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git