Bug 169581: the last two arguments to pk11_mkSlotString should have the

type PRBool, not unsigned char.  As a byproduct this change works around
what seems to be a gnupro gcc compiler optimization bug.  r=relyea.
Modified Files: pk11db.c pk11pars.h

security/nss/lib/softoken/pk11db.c

@@ -625,8 +625,7 @@ secmod_DecodeData(char *defParams, DBT *data, PRBool *retInternal)
 
 	slotStrings[i] = pk11_mkSlotString(slotID, defaultFlags, timeout, 
 	                                   (unsigned char)slots[i].askpw, 
-	                                   (unsigned char)hasRootCerts, 
+	                                   hasRootCerts, hasRootTrust);
-	                                   (unsigned char)hasRootTrust);
     }
 
     nss = pk11_mkNSS(slotStrings, slotCount, internal, isFIPS, isModuleDB, 

security/nss/lib/softoken/pk11pars.h

@@ -737,7 +737,7 @@ pk11_mkRootFlags(PRBool hasRootCerts, PRBool hasRootTrust)
 static char *
 pk11_mkSlotString(unsigned long slotID, unsigned long defaultFlags,
 		  unsigned long timeout, unsigned char askpw_in,
-		  unsigned char hasRootCerts, unsigned char hasRootTrust) {
+		  PRBool hasRootCerts, PRBool hasRootTrust) {
     char *askpw,*flags,*rootFlags,*slotString;
     char *flagPair,*rootFlagsPair;