Bug 977869: Call LoadMechanismList, just once, in the main() function.

r=emaldona,rrelyea.

3 files changed, 11 insertions, 29 deletions

diff --git a/cmd/modutil/modutil.c b/cmd/modutil/modutil.c
index 2cc9a1335..ba07bba4f 100644
--- a/cmd/modutil/modutil.c
+++ b/cmd/modutil/modutil.c
@@ -832,6 +832,11 @@ main(int argc, char *argv[])
 		goto loser;
 	}
 
+	errcode = LoadMechanismList();
+	if (errcode != SUCCESS) {
+		goto loser;
+	}
+
 	/* Execute the command */
 	switch(command) {
 	case ADD_COMMAND:
diff --git a/cmd/modutil/modutil.h b/cmd/modutil/modutil.h
index 2505f2edd..df0e7a5c4 100644
--- a/cmd/modutil/modutil.h
+++ b/cmd/modutil/modutil.h
@@ -20,6 +20,7 @@
 
 #include "error.h"
 
+Error LoadMechanismList(void);
 Error FipsMode(char *arg);
 Error ChkFipsMode(char *arg);
 Error AddModule(char *moduleName, char *libFile, char *ciphers,
diff --git a/cmd/modutil/pk11.c b/cmd/modutil/pk11.c
index df687665b..d630e4eee 100644
--- a/cmd/modutil/pk11.c
+++ b/cmd/modutil/pk11.c
@@ -275,12 +275,6 @@ AddModule(char *moduleName, char *libFile, char *cipherString,
     unsigned long ciphers;
     unsigned long mechanisms;
     SECStatus status;
-    Error rv;
-
-    rv = LoadMechanismList();
-    if (rv != SUCCESS) {
-	return rv;
-    }
 
     mechanisms =
 	getFlagsFromString(mechanismString, mechanismStrings,
@@ -530,11 +524,6 @@ ListModule(char *moduleName)
 	return SUCCESS;
     }
 
-    rv = LoadMechanismList();
-    if (rv != SUCCESS) {
-	return rv;
-    }
-
     module = SECMOD_FindModule(moduleName);
     if(!module) {
 	PR_fprintf(PR_STDERR, errStrings[NO_SUCH_MODULE_ERR], moduleName);
@@ -853,18 +842,11 @@ SetDefaultModule(char *moduleName, char *slotName, char *mechanisms)
     SECMODModule *module = NULL;
     PK11SlotInfo *slot;
     int s, i;
-    unsigned long mechFlags;
+    unsigned long mechFlags = getFlagsFromString(mechanisms, mechanismStrings,
+	numMechanismStrings);
     PRBool found = PR_FALSE;
-    Error errcode;
+    Error errcode = UNSPECIFIED_ERR;
 
-    errcode = LoadMechanismList();
-    if (errcode != SUCCESS) {
-	return errcode;
-    }
-    errcode = UNSPECIFIED_ERR;
-
-    mechFlags = getFlagsFromString(mechanisms, mechanismStrings,
-	numMechanismStrings);
     mechFlags =  SECMOD_PubMechFlagstoInternal(mechFlags);
 
     module = SECMOD_FindModule(moduleName);
@@ -930,17 +912,11 @@ UnsetDefaultModule(char *moduleName, char *slotName, char *mechanisms)
     SECMODModule * module = NULL;
     PK11SlotInfo *slot;
     int s, i;
-    unsigned long mechFlags;
+    unsigned long mechFlags = getFlagsFromString(mechanisms,
+	mechanismStrings, numMechanismStrings);
     PRBool found = PR_FALSE;
     Error rv;
 
-    rv  = LoadMechanismList();
-    if (rv != SUCCESS) {
-	return rv;
-    }
-
-    mechFlags = getFlagsFromString(mechanisms, mechanismStrings,
-	numMechanismStrings);
     mechFlags =  SECMOD_PubMechFlagstoInternal(mechFlags);
 
     module = SECMOD_FindModule(moduleName);