Attachment 314820 Details for Bug 453508 – patch v1

[patch] patch v1

patch (text/plain), 3.17 KB, created by Ade Lee on 2008-08-22 16:47:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ade Lee

Created: 2008-08-22 16:47:31 UTC

Size: 3.17 KB

patch

obsolete

>Index: src/engine/RA.cpp
>===================================================================
>--- src/engine/RA.cpp   (revision 110)
>+++ src/engine/RA.cpp   (working copy)
>@@ -27,6 +27,11 @@
> #include <stdlib.h>
> #include <string.h>
> 
>+#include "httpd/httpd.h"
>+#include "httpd/http_config.h"
>+#include "httpd/http_log.h"
>+#include "httpd/http_protocol.h"
>+#include "httpd/http_main.h"
> #include "prmem.h"
> #include "prsystem.h"
> #include "plstr.h"
>@@ -37,8 +42,8 @@
> #include "cert.h"
> #include "tus/tus_db.h"
> #include "secder.h"
>+#include "nss.h"
> 
>-
> #ifdef __cplusplus
> }
> #endif
>@@ -1743,6 +1748,8 @@
>     CERTCertificate *cert = NULL;
>     int rc = 0;
>     int i=0;
>+    SECStatus rv;
>+    PRUint32 flags = 0;
> 
>     *len = 0;
> 
>@@ -1764,13 +1771,30 @@
>         PR_snprintf((char *)configname, 256, "conn.%s%d.clientNickname", id, i);
>         const char *clientnickname = m_cfg->GetConfigAsString(configname);
> 
>-        // Bugscape Bug #56583:  insure that specified certificate is present
>-        //
>-        // (1) To prevent a coredump, we need to determine if NSS has been
>-        //     initialized prior to loading this TPS plugin.  However,
>-        //     since NSS does not provide a callable initialization check
>-        //     to inform the caller whether or not NSS has been initialized,
>-        //     we need to supply the following workaround solution:
>+       if (!NSS_IsInitialized()) {
>+
>+           RA::Debug( LL_PER_SERVER,
>+                           "RA::InitializeHttpConnections",
>+                           "Initializing NSS"
>+                           );
>+
>+            PR_snprintf((char *)configname, 256, "%s/alias", (char *) ap_server_root);
>+           rv = NSS_Initialize (configname, "", "", SECMOD_DB, NSS_INIT_READONLY);
>+            if (rv != SECSuccess)
>+            {
>+
>+               RA::Error( LL_PER_SERVER,
>+                           "RA::InitializeHttpConnections",
>+                           "NSS not initialized successfully"
>+                           );
>+
>+                ctx->InitializationError( "RA::InitializeHttpConnections",
>+                                          __LINE__ );
>+                rc = -1;
>+                goto loser;
>+            }
>+        }
>+
>         handle = CERT_GetDefaultCertDB();
>         if( handle == 0 ) {
>             ctx->InitializationError( "RA::InitializeHttpConnections",
>
>Index: Makefile.in
>===================================================================
>--- Makefile.in (revision 110)
>+++ Makefile.in (working copy)
>@@ -816,11 +816,11 @@
>                                        src/processor/RA_Unblock_Processor.cpp     \
>                                        src/processor/RA_Format_Processor.cpp
> 
>-libtps_la_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @svrcore_inc@ \
>+libtps_la_CPPFLAGS = $(AM_CPPFLAGS) @apr_inc@ @apache_inc@ @ldapsdk_inc@ @svrcore_inc@ \
>        @sasl_inc@ @nss_inc@ @nspr_inc@
> 
> libtps_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
>-libtps_la_LIBADD = libtokendb.la $(LDAPSDK_LINK) $(SVRCORE_LINK)          \
>+libtps_la_LIBADD = libtokendb.la $(APACHE_LINK) $(APR_LINK) $(LDAPSDK_LINK) $(SVRCORE_LINK)    \
>        $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL) \
>        $(LIBCSTD) $(LIBCRUN)
>

Actions: View | Diff

Attachments on bug 453508: 311957 | 314820 | 314824 | 325404 | 326173