[Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp,1.8,1.9

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209/coolkey

Modified Files:
	CoolKey.cpp 
Log Message:
Fix for #235474, remove password prompt pref for Security Officer mode.


Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoolKey.cpp	25 Jul 2007 20:43:22 -0000	1.8
+++ CoolKey.cpp	29 Mar 2009 00:23:54 -0000	1.9
@@ -266,15 +266,18 @@
 	CoolKeyReference reference, CoolKeyRelease release,
         CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
 {
+    char tBuff[56];
     g_Dispatch = dispatch;
     g_Reference = reference;
     g_Release = release;
     g_GetConfigValue = getconfigvalue;
     g_SetConfigValue = setconfigvalue;
 
-    char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
+    char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.security.url");
+
+    PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeySetCallbacks: prompt %s \n", GetTStamp(tBuff,56), suppressPINPrompt));
 
-    if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
+    if(!suppressPINPrompt)
     {
         PK11_SetPasswordFunc( CoolKeyVerifyPassword);
     }