[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.16, 1.17

Jack Magne (jmagne) fedora-directory-commits at redhat.com
Wed May 28 03:00:35 UTC 2008


Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29771

Modified Files:
	ESC.js 
Log Message:
ON Mac get cached phone home url if it can't be read off the token.



Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ESC.js	4 Mar 2008 23:39:54 -0000	1.16
+++ ESC.js	28 May 2008 03:00:33 -0000	1.17
@@ -3639,7 +3639,7 @@
 
           if(!url ||  url.length < 10)   // Check for bogus junk
           {
-              recordMessage("Bogus url found ....");
+              recordMessage("Bogus url found .... " + url);
               url = null;
               Sleep(250);
               recordMessage("Going to try again... ");
@@ -3650,7 +3650,6 @@
           tries ++;
       }
 
-
       if(url)
       {
           var issuer_config_value = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL);
@@ -3684,10 +3683,25 @@
           var issuer_config_value_exp = ConfigValueWithKeyID(keyID,KEY_ISSUER_URL);
           var result_exp = DoCoolKeySetConfigValue(issuer_config_value_exp,url);
       }
+
+      if(isMac && !url) {
+          var phoneHomeUrl = GetCachedPhoneHomeURL(keyID);
+          if(phoneHomeUrl)  {
+             url = phoneHomeUrl;
+          }
+
+      }
       recordMessage("From exception returning " + url);
       return url;
   }
 
+  if(isMac && !url) {
+      var phoneHomeUrl = GetCachedPhoneHomeURL(keyID);
+      if(phoneHomeUrl)  {
+         url = phoneHomeUrl;
+      }
+  }
+
   return url;
 }
 




More information about the Fedora-directory-commits mailing list