Attachment 314824 Details for Bug 453508 – patch take 2

[patch] patch take 2

patch2 (text/plain), 3.07 KB, created by Ade Lee on 2008-08-22 17:55:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ade Lee

Created: 2008-08-22 17:55:19 UTC

Size: 3.07 KB

patch

obsolete

>Index: pki/linux/tps/pki-tps.spec
>===================================================================
>--- pki/linux/tps/pki-tps.spec  (revision 110)
>+++ pki/linux/tps/pki-tps.spec  (working copy)
>@@ -34,7 +34,7 @@
> ## Package Header Definitions
> %define base_name         %{base_prefix}-%{base_component}
> %define base_version      1.0.0
>-%define base_release      3
>+%define base_release      4
> %define base_group        System Environment/Daemons
> %define base_vendor       Red Hat, Inc.
> %define base_license      LGPLv2 with exceptions
>@@ -312,6 +312,8 @@
> ###############################################################################
> 
> %changelog
>+* Fri Aug 22 2008 Ade Lee <alee@redhat.com> 1.0.0-4
>+- Fix for bug#453508 - TPS segfaults with latest mod_nss.
> * Tue Aug 5 2008 Ade Lee <alee@redhat.com> 1.0.0-3
> - Fix for bug#454565 - Broken Installation Wizard for TPS and RA with latest modutil.
> * Tue Apr 1 2008 Jack Magne <jmagne@redhat.com> 1.0.0-2
>
>Index: pki/base/tps/src/engine/RA.cpp
>===================================================================
>--- pki/base/tps/src/engine/RA.cpp      (revision 110)
>+++ pki/base/tps/src/engine/RA.cpp      (working copy)
>@@ -37,8 +37,8 @@
> #include "cert.h"
> #include "tus/tus_db.h"
> #include "secder.h"
>+#include "nss.h"
> 
>-
> #ifdef __cplusplus
> }
> #endif
>@@ -1743,6 +1743,8 @@
>     CERTCertificate *cert = NULL;
>     int rc = 0;
>     int i=0;
>+    SECStatus rv;
>+    PRUint32 flags = 0;
> 
>     *len = 0;
> 
>@@ -1764,13 +1766,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", m_cfg->GetConfigAsString("service.instanceDir", NULL));
>+           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",
>

Actions: View | Diff

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