From 182dacfa697d99bf6e975708da6476e32fee05ce Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Apr 2010 23:26:00 +0000
Subject: [PATCH] moznss cleanup

---
 libraries/libldap/tls_m.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
index 443b966346..281a244fd3 100644
--- a/libraries/libldap/tls_m.c
+++ b/libraries/libldap/tls_m.c
@@ -103,9 +103,10 @@ static PRDescIdentity	tlsm_layer_id;
 
 static const PRIOMethods tlsm_PR_methods;
 
-static const char* pem_library = "nsspem";
-static const char *pem_mod_name = "PEM";
-static SECMODModule* pem_module;
+#define PEM_LIBRARY	"nsspem"
+#define PEM_MODULE	"PEM"
+
+static SECMODModule *pem_module;
 
 #define DEFAULT_TOKEN_NAME "default"
 /* sprintf format used to create token name */
@@ -978,9 +979,9 @@ tlsm_init_pem_module( void )
 
 	/* not loaded - load it */
 	/* get the system dependent library name */
-	fullname = PR_GetLibraryName( NULL, pem_library );
+	fullname = PR_GetLibraryName( NULL, PEM_LIBRARY );
 	/* Load our PKCS#11 module */
-	configstring = PR_smprintf( "library=%s name=%s parameters=\"\"", fullname, pem_mod_name );
+	configstring = PR_smprintf( "library=%s name=" PEM_MODULE " parameters=\"\"", fullname );
 	PL_strfree( fullname );
 
 	pem_module = SECMOD_LoadUserModule( configstring, NULL, PR_FALSE );
-- 
GitLab