bug 122126, reviewed by valeski

network/main/mkgeturl.c

@@ -1045,6 +1045,11 @@ net_CallExitRoutine(Net_GetUrlExitFunc *exit_routine,
 	}
 
 	if ( exit_routine != NULL ) {
+#if defined(SingleSignon)
+		if (status<0 && URL_s->error_msg != NULL) {
+		    SI_RemoveUser(URL_s->address, NULL, TRUE);
+		}
+#endif
 		(*exit_routine) (URL_s, status, window_id);
 	}
 }
@@ -1676,6 +1681,9 @@ NET_ShutdownNetLib(void)
 
 #ifdef MOZILLA_CLIENT
 	NET_SaveCookies("");
+#if defined(SingleSignon)
+        SI_SaveSignonData("");
+#endif
 	GH_SaveGlobalHistory();
 #endif /* MOZILLA_CLIENT */
 
@@ -4721,6 +4729,11 @@ NET_DestroyEvidence()
 	/* Handle cookies */
 	NET_RemoveAllCookies();
 
+#if defined(SingleSingon)
+	/* Handle single signons */
+	SI_RemoveAllSignonData();
+#endif
+
 	/* Handle disk cache */
 	oldSize = NET_GetDiskCacheSize();
 	NET_SetDiskCacheSize(0); /* zero it out */
@@ -5026,4 +5039,3 @@ NET_InitMailtoProtocol(void)
 #ifdef PROFILE
 #pragma profile off
 #endif
-

network/protocol/about/mkabout.c

@@ -356,6 +356,14 @@ PRIVATE int net_output_about_url(ActiveEntry * cur_entry)
 		NET_DisplayCookieInfoAsHTML(cur_entry);
 		return(-1);
 	}
+#if defined(SingleSignon)
+        else if(!PL_strcasecmp(which, "signons"))
+	{
+		extern void SI_DisplaySignonInfoAsHTML(ActiveEntry * cur_entry);
+		SI_DisplaySignonInfoAsHTML(cur_entry);
+		return(-1);
+	}
+#endif
 	else if(!PL_strncasecmp(which, "cache", 5))
 	  {
 		NET_DisplayCacheInfoAsHTML(cur_entry);

network/protocol/pop3/mkpop3.c

@@ -2506,6 +2506,9 @@ net_ProcessPop3 (ActiveEntry *ce)
                                  (host ? PL_strlen(host) : 0) + 300) 
 								 * sizeof(char);
 					char *prompt = (char *) PR_Malloc (len);
+#if defined(SingleSignon)                                        
+					char *usernameAndHost=0;
+#endif
 					if (!prompt) {
 						FREEIF(host);
 						return MK_OUT_OF_MEMORY;
@@ -2518,10 +2521,25 @@ net_ProcessPop3 (ActiveEntry *ce)
 									? cd->command_response
 									: XP_GetString(XP_NO_ANSWER)),
 								   net_pop3_username, host);
+#if defined(SingleSignons)                                        
+					StrAllocCopy(usernameAndHost, net_pop3_username);
+					StrAllocCat(usernameAndHost, "@");
+					StrAllocCat(usernameAndHost, host);
 					FREEIF (host);
 
+					password = SI_PromptPassword
+					    (ce->window_id,
+					    prompt, usernameAndHost,
+					    FALSE, !cd->password_failed);
 					cd->password_failed = FALSE;
-					password = FE_PromptPassword(ce->window_id, prompt);
+					XP_FREE(usernameAndHost);
+
+#else
+					FREEIF (host);
+					cd->password_failed = FALSE;
+					password = FE_PromptPassword
+					    (ce->window_id, prompt);
+#endif
 					PR_Free(prompt);
 
 					if (password == NULL)