From 73cb88057fc517170ec67cc1aafcfa9040af8b38 Mon Sep 17 00:00:00 2001 From: "morse%netscape.com" Date: Tue, 27 Jun 2000 21:13:50 +0000 Subject: [PATCH] fix bug 43886, single signon no longer works, r=jefft git-svn-id: svn://10.0.0.236/trunk@73323 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/psm-glue/src/nsPSMUICallbacks.cpp | 2 +- mozilla/extensions/wallet/src/singsign.cpp | 6 +++--- mozilla/extensions/wallet/src/singsign.h | 15 +++++++++------ .../mailnews/base/util/nsMsgIncomingServer.cpp | 2 +- mozilla/mailnews/compose/src/nsSmtpServer.cpp | 2 +- mozilla/mailnews/local/src/nsPop3Protocol.cpp | 2 +- mozilla/mailnews/news/src/nsNewsFolder.cpp | 2 +- .../protocol/ftp/src/nsFtpConnectionThread.cpp | 5 +++-- .../netwerk/protocol/http/src/nsHTTPChannel.cpp | 2 +- 9 files changed, 21 insertions(+), 17 deletions(-) diff --git a/mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp b/mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp index 94f8a9b8969..da7a84159f9 100644 --- a/mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp +++ b/mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp @@ -315,7 +315,7 @@ char * PromptUserCallback(void *arg, char *prompt, int isPasswd) if (NS_SUCCEEDED(rv)) { rv = dialog->PromptPassword(nsnull, NS_ConvertASCIItoUCS2(prompt).GetUnicode(), NS_ConvertASCIItoUCS2(" ").GetUnicode(), // hostname - PR_TRUE, &password, &value); + nsIPrompt::SAVE_PASSWORD_NEVER, &password, &value); if (NS_SUCCEEDED(rv) && value) { nsString a(password); diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index 7aaafccdc52..f79f4d6e1e6 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -367,7 +367,7 @@ si_CheckGetPassword if (dialogTitle == nsnull || nsCRT::strlen(dialogTitle) == 0) prompt_string = Wallet_Localize("PromptForPassword"); PRUnichar * check_string; - if (savePassword != SINGSIGN_SAVE_PERMANENTLY) { + if (savePassword != SINGSIGN_SAVE_PASSWORD_PERMANENTLY) { check_string = nsnull; } else if (SI_GetBoolPref(pref_Crypto, PR_FALSE)) { check_string = Wallet_Localize("SaveThisValueEncrypted"); @@ -428,7 +428,7 @@ si_CheckGetData if (dialogTitle == nsnull || nsCRT::strlen(dialogTitle) == 0) prompt_string = Wallet_Localize("PromptForData"); PRUnichar * check_string; - if (savePassword != SINGSIGN_SAVE_PERMANENTLY) { + if (savePassword != SINGSIGN_SAVE_PASSWORD_PERMANENTLY) { check_string = nsnull; } else if (SI_GetBoolPref(pref_Crypto, PR_FALSE)) { check_string = Wallet_Localize("SaveThisValueEncrypted"); @@ -491,7 +491,7 @@ si_CheckGetUsernamePassword PRUnichar * user_string = Wallet_Localize("UserName"); PRUnichar * password_string = Wallet_Localize("Password"); PRUnichar * check_string; - if (savePassword != SINGSIGN_SAVE_PERMANENTLY) { + if (savePassword != SINGSIGN_SAVE_PASSWORD_PERMANENTLY) { check_string = nsnull; } else if (SI_GetBoolPref(pref_Crypto, PR_FALSE)) { check_string = Wallet_Localize("SaveTheseValuesEncrypted"); diff --git a/mozilla/extensions/wallet/src/singsign.h b/mozilla/extensions/wallet/src/singsign.h index 2febc71bb98..996bffbf940 100644 --- a/mozilla/extensions/wallet/src/singsign.h +++ b/mozilla/extensions/wallet/src/singsign.h @@ -36,8 +36,8 @@ /* Duplicates defines as in nsIPrompt.idl -- keep in sync! */ #define SINGSIGN_SAVE_PASSWORD_NEVER 0 -#define SINGSIGN_SAVE_FOR_SESSION 1 -#define SINGSIGN_SAVE_PERMANENTLY 2 +#define SINGSIGN_SAVE_PASSWORD_FOR_SESSION 1 +#define SINGSIGN_SAVE_PASSWORD_PERMANENTLY 2 class nsIPrompt; XP_BEGIN_PROTOS @@ -57,17 +57,20 @@ SINGSIGN_RestoreSignonData(nsIPrompt* dialog, const char* passwordRealm, const P extern nsresult SINGSIGN_PromptUsernameAndPassword (const PRUnichar *dialogTitle, const PRUnichar *text, PRUnichar **user, PRUnichar **pwd, - const char* passwordRealm, nsIPrompt* dialog, PRBool *returnValue, PRUint32 savePassword = SINGSIGN_SAVE_PERMANENTLY); + const char* passwordRealm, nsIPrompt* dialog, PRBool *returnValue, + PRUint32 savePassword = SINGSIGN_SAVE_PASSWORD_PERMANENTLY); extern nsresult SINGSIGN_PromptPassword - (const PRUnichar *dialogTitle, const PRUnichar *text, PRUnichar **pwd, const char* passwordRealm, - nsIPrompt* dialog, PRBool *returnValue, PRUint32 savePassword = SINGSIGN_SAVE_PERMANENTLY); + (const PRUnichar *dialogTitle, const PRUnichar *text, PRUnichar **pwd, + const char* passwordRealm, nsIPrompt* dialog, PRBool *returnValue, + PRUint32 savePassword = SINGSIGN_SAVE_PASSWORD_PERMANENTLY); extern nsresult SINGSIGN_Prompt (const PRUnichar *dialogTitle, const PRUnichar *text, const PRUnichar *defaultText, PRUnichar **resultText, - const char* passwordRealm, nsIPrompt* dialog, PRBool *returnValue, PRUint32 savePassword = SINGSIGN_SAVE_PERMANENTLY); + const char* passwordRealm, nsIPrompt* dialog, PRBool *returnValue, + PRUint32 savePassword = SINGSIGN_SAVE_PASSWORD_PERMANENTLY); extern PRBool SINGSIGN_RemoveUser diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index 4ad245f5221..f4f8c418cc9 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -632,7 +632,7 @@ nsMsgIncomingServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, const rv = GetServerURI(getter_Copies(serverUri)); if (NS_FAILED(rv)) return rv; rv = dialog->PromptPassword(aPromptTitle, aPromptMessage, - NS_ConvertToString(serverUri).GetUnicode(), PR_TRUE, + NS_ConvertToString(serverUri).GetUnicode(), nsIPrompt::SAVE_PASSWORD_PERMANENTLY, getter_Copies(uniPassword), okayValue); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/compose/src/nsSmtpServer.cpp b/mozilla/mailnews/compose/src/nsSmtpServer.cpp index a98ab2e2544..96abe76dee5 100644 --- a/mozilla/mailnews/compose/src/nsSmtpServer.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpServer.cpp @@ -209,7 +209,7 @@ nsSmtpServer::GetPasswordWithUI(const PRUnichar * aPromptMessage, const rv = GetServerURI(getter_Copies(serverUri)); if (NS_FAILED(rv)) return rv; rv = aDialog->PromptPassword(aPromptTitle, aPromptMessage, - NS_ConvertToString(serverUri).GetUnicode(), PR_TRUE, + NS_ConvertToString(serverUri).GetUnicode(), nsIPrompt::SAVE_PASSWORD_PERMANENTLY, getter_Copies(uniPassword), &okayValue); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/mailnews/local/src/nsPop3Protocol.cpp b/mozilla/mailnews/local/src/nsPop3Protocol.cpp index 271ba67686b..ee491af615b 100644 --- a/mozilla/mailnews/local/src/nsPop3Protocol.cpp +++ b/mozilla/mailnews/local/src/nsPop3Protocol.cpp @@ -2494,7 +2494,7 @@ nsresult nsPop3Protocol::ProcessProtocolState(nsIURI * url, nsIInputStream * aIn password = SI_PromptPassword (ce->window_id, prompt, usernameAndHost, - PR_FALSE, !TestFlag(POP3_PASSWORD_FAILED)); + nsIPrompt::SAVE_PASSWORD_PERMANENTLY, !TestFlag(POP3_PASSWORD_FAILED)); ClearFlag(POP3_PASSWORD_FAILED); PR_Free(usernameAndHost); #else diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index 0f32e0f7fe7..9f1918e3a10 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -1408,7 +1408,7 @@ nsMsgNewsFolder::GetGroupPasswordWithUI(const PRUnichar * aPromptMessage, const if (NS_FAILED(rv)) return rv; nsAutoString realm = NS_ConvertToString(signonURL); - rv = dialog->PromptPassword(aPromptTitle, aPromptMessage, realm.GetUnicode(), PR_TRUE, + rv = dialog->PromptPassword(aPromptTitle, aPromptMessage, realm.GetUnicode(), nsIPrompt::SAVE_PASSWORD_PERMANENTLY, getter_Copies(uniGroupPassword), &okayValue); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index c6eb4b0bc72..183c888e730 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -825,7 +825,7 @@ nsFtpConnectionThread::S_user() { nsAutoString realm = NS_ConvertToString(host); // XXX i18n rv = proxyprompter->PromptUsernameAndPassword(nsnull, message.GetUnicode(), - realm.GetUnicode(), PR_FALSE, + realm.GetUnicode(), nsIPrompt::SAVE_PASSWORD_PERMANENTLY, &user, &passwd, &retval); // if the user canceled or didn't supply a username we want to fail @@ -910,7 +910,8 @@ nsFtpConnectionThread::S_pass() { rv = proxyprompter->PromptPassword(title.GetUnicode(), message.GetUnicode(), NS_ConvertASCIItoUCS2(prePath).GetUnicode(), - PR_FALSE, &passwd, &retval); + nsIPrompt::SAVE_PASSWORD_PERMANENTLY, + &passwd, &retval); // we want to fail if the user canceled or didn't enter a password. if (!retval || (passwd && !*passwd) ) diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp index 17a5381a7f9..b3a722e14ad 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPChannel.cpp @@ -1844,7 +1844,7 @@ nsHTTPChannel::Authenticate(const char *iChallenge, PRBool iProxyAuth) rv = mPrompter->PromptUsernameAndPassword(nsnull, message.GetUnicode(), prePath.GetUnicode(), - PR_FALSE, + nsIPrompt::SAVE_PASSWORD_PERMANENTLY, getter_Copies(userBuf), getter_Copies(passwdBuf), &retval);