[Fedora-directory-commits] mod_nss nss_engine_init.c, 1.23, 1.24 nss_engine_log.c, 1.4, 1.5

Author: rcritten Update of /cvs/dirsec/mod_nss In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5489 Modified Files: nss_engine_init.c nss_engine_log.c Log Message: 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. Index: nss_engine_init.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- nss_engine_init.c 24 Aug 2006 15:50:20 -0000 1.23 +++ nss_engine_init.c 17 Oct 2006 16:45:57 -0000 1.24 @@ -1019,7 +1019,7 @@ 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 @@ * 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 @@ /* 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; Index: nss_engine_log.c =================================================================== RCS file: /cvs/dirsec/mod_nss/nss_engine_log.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nss_engine_log.c 7 Apr 2006 20:17:12 -0000 1.4 +++ nss_engine_log.c 17 Oct 2006 16:45:57 -0000 1.5 @@ -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 @@ { 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[] = {