Whomp the MAC_SECURITY_BRANCH onto the tip.

security/psm/lib/client/cmtinit.c

@@ -108,7 +108,9 @@ setWorkingDir(char *path)
 static CMTStatus
 launch_psm(char *executable)
 {
+#ifndef XP_MAC
     char command[MAX_PATH_LEN];
+#endif
 #ifdef WIN32
     STARTUPINFO sui;
     PROCESS_INFORMATION pi;
@@ -161,12 +163,14 @@ PCMT_CONTROL CMT_EstablishControlConnection(char            *inPath,
                                             CMT_MUTEX       *mutex)
 {
     PCMT_CONTROL control;
+#ifndef XP_MAC
     char *executable;
     char *newWorkingDir;
     char oldWorkingDir[MAX_PATH_LEN];
+    size_t stringLen;
+#endif    
     int i;
     char *path = NULL;
-    size_t stringLen;
 
     /*	On the Mac, we do special magic in the Seamonkey PSM component, so
     	if PSM isn't launched by the time we reach this point, we're not doing well. */

security/psm/lib/client/cmtutils.c

@@ -324,7 +324,7 @@ loser:
 CMTStatus CMT_TransmitMessage(PCMT_CONTROL control, CMTItem * message)
 {
     CMTMessageHeader header;
-	CMUint32 sent, rv;
+	CMUint32 sent;
 
     /* Set up the message header */
     header.type = htonl(message->type);
@@ -356,7 +356,7 @@ loser:
 CMTStatus CMT_ReceiveMessage(PCMT_CONTROL control, CMTItem * response)
 {
     CMTMessageHeader header;
-    CMUint32 numread, rv;
+    CMUint32 numread;
 
     /* Get the message header */
     numread = CMT_ReadThisMany(control, control->sock, 

security/psm/server/advisor.c

@@ -682,7 +682,8 @@ loser:
 }
 
 SSMStatus
-SSMSecurityAdvisorContext_DoPKCS12Response(HTTPRequest *req,
+SSMSecurityAdvisorContext_DoPKCS12Response(SSMSecurityAdvisorContext *advisor,
+                                           HTTPRequest *req,
                                            const char  *responseKey)
 {
     SSMTextGenContext *cx = NULL;
@@ -713,7 +714,7 @@ SSMSecurityAdvisorContext_DoPKCS12Response(HTTPRequest *req,
     if (rv != SSM_SUCCESS) {
         goto loser;
     }
-    out = PR_smprintf(content, alertMessage);
+    out = PR_smprintf(content, alertMessage, advisor->super.m_id);
     rv = SSM_HTTPSendOKHeader(req, hdrs, type);
     if (rv != SSM_SUCCESS) {
         goto loser;
@@ -832,7 +833,7 @@ SSMStatus SSMSecurityAdvisorContext_DoPKCS12Restore(
             responseKey = "pkcs12_restore_success";
             SSM_ChangeCertSecAdvisorList(req, NULL, certHashAdd);
         }
-        rv = SSMSecurityAdvisorContext_DoPKCS12Response(req, responseKey);
+        rv = SSMSecurityAdvisorContext_DoPKCS12Response(res, req, responseKey);
     }
  done:
     if (p12Cxt != NULL) {
@@ -1029,7 +1030,7 @@ SSMSecurityAdvisorContext_BackupAllMineCerts(SSMSecurityAdvisorContext *cx,
     }
     SSM_FreeResource(&p12Cxt->super);
     p12Cxt = NULL;
-    if (SSMSecurityAdvisorContext_DoPKCS12Response(req, responseKey)
+    if (SSMSecurityAdvisorContext_DoPKCS12Response(cx, req, responseKey)
         != SSM_SUCCESS) {
         goto loser;
     }
@@ -1094,7 +1095,7 @@ SSMStatus SSMSecurityAdvisorContext_DoPKCS12Backup(
             responseKey = SSMUI_GetPKCS12Error(rv, PR_TRUE);
         }
     }
-    if (SSMSecurityAdvisorContext_DoPKCS12Response(req, responseKey)
+    if (SSMSecurityAdvisorContext_DoPKCS12Response(cx, req, responseKey)
         != SSM_SUCCESS) {
         goto loser;
     }
@@ -3097,7 +3098,7 @@ static SECStatus ssm_get_potential_ocsp_signers(CERTCertificate *cert,
     }
     
  done:
-    return SSM_SUCCESS;
+    return SECSuccess;
 }
 
 static void

security/psm/server/advisor.h

@@ -135,7 +135,8 @@ SSMStatus SSMSecurityAdvisorContext_Print(SSMResource *res,
                                          char *fmt, PRIntn numParam,
                                          char **value, char **resultStr);
 
-SSMStatus SSMSecurityAdvisorContext_DoPKCS12Response(HTTPRequest *req,
+SSMStatus SSMSecurityAdvisorContext_DoPKCS12Response(SSMSecurityAdvisorContext *cx,
+                                                     HTTPRequest *req,
                                            			const char  *responseKey);
 
 SSMStatus SSMSecurityAdvisorContext_DoPKCS12Restore(SSMSecurityAdvisorContext *res,

security/psm/server/ctrlconn.c

@@ -823,8 +823,11 @@ ssm_certdb_name_cb(void *arg, int dbVersion)
 
 #ifdef XP_MAC
 	/* on Mac, :: means parent directory. does non-Mac get // with Seamonkey? */
-    PR_ASSERT(configdir[strlen(configdir) - 1] == ':');
-    return PR_smprintf("%sCertificates%s", configdir, dbver);
+    if(configdir[PL_strlen(configdir) - 1] == ':') {
+    	return PR_smprintf("%sCertificates%s", configdir, dbver);
+    } else {
+    	return PR_smprintf("%s:Certificates%s", configdir, dbver);
+    }
 #else
     return PR_smprintf("%s/cert%s.db", configdir, dbver);
 #endif
@@ -845,8 +848,11 @@ static char *ssm_keydb_name_cb(void *arg, int dbVersion)
       break;
     }
 #ifdef XP_MAC
-    PR_ASSERT(configdir[strlen(configdir) - 1] == ':');
-    return PR_smprintf("%sKey Database%s", configdir, dbver);
+    if (configdir[PL_strlen(configdir) - 1] == ':') {
+    	return PR_smprintf("%sKey Database%s", configdir, dbver);
+    } else {
+    	return PR_smprintf("%s:Key Database%s", configdir, dbver);
+    }
 #else
     return PR_smprintf("%s/key%s.db", configdir, dbver);
 #endif
@@ -926,8 +932,11 @@ ssm_OpenSecModDB(const char * configdir)
 #ifdef XP_UNIX
     secmodname = PR_smprintf("%s/secmodule.db", configdir);
 #elif defined(XP_MAC)
-    PR_ASSERT(configdir[strlen(configdir) - 1] == ':');
-    secmodname = PR_smprintf("%sSecurity Modules", configdir);
+    if (configdir[PL_strlen(configdir) - 1] == ':') {
+    	secmodname = PR_smprintf("%sSecurity Modules", configdir);
+    } else {
+    	secmodname = PR_smprintf("%s:Security Modules", configdir);
+    }
 #else
     secmodname = PR_smprintf("%s/secmod.db", configdir);
 #endif

security/psm/server/servimpl.h

@@ -42,7 +42,7 @@
 #define PSM_DOC_DIR "./psmdata/doc/"
 #else
 #ifdef XP_MAC
-#define PSM_DOC_DIR ":doc:"
+#define PSM_DOC_DIR "psmdata/doc/"
 #else
 #define PSM_DOC_DIR ".\\psmdata\\doc\\"
 #endif

security/psm/ui/psm_ui.properties.in

@@ -1057,11 +1057,11 @@ prefs_list_js:
 {get_pref_list}
 
 var prefix = '<input type=hidden name="';
-var suffix = '">\\n';
+var suffix = '">';
 
 function writePrefInput(d, s)
 {
-    d.write(prefix + s + suffix);
+    d.writeln(prefix + s + suffix);
 }
 
 // creates the hidden buttons that are used to submit pref changes
@@ -6588,7 +6588,7 @@ pkcs12_action_followup_content:
 
 function showAlert() {
 	 PopUpAlert("%1$s");
-	 window.location = "get?baseRef=cert_mine";
+	 window.location = "get?baseRef=cert_mine&target=%2$d";
 }
 </script>
 </head>