refine change-password to work with a dummy nsSDR.cpp

git-svn-id: svn://10.0.0.236/trunk@70248 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
morse%netscape.com
2000-05-17 02:46:52 +00:00
parent 472c09e475
commit fa1ea2300d

View File

@@ -1077,11 +1077,15 @@ WLLT_ExpirePassword() {
Recycle(message);
}
PRBool changingPassword = PR_FALSE;
PUBLIC
void WLLT_ChangePassword() {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
changingPassword = PR_TRUE;
rv = gSecretDecoderRing->ChangePassword();
changingPassword = PR_FALSE;
}
if (NS_FAILED(rv)) {
PRUnichar * message = Wallet_Localize("PasswordNotChanged");
@@ -2816,12 +2820,13 @@ wallet_ReencryptAll(const char * newpref, void * data) {
level ++;
/* logout first so there is no conversion unless user knows the master password */
if (!changingPassword) {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
rv = gSecretDecoderRing->Logout();
}
wallet_Initialize(PR_FALSE);
}
wallet_MapElement * ptr;
nsAutoString value;
PRInt32 count = LIST_COUNT(wallet_SchemaToValue_list);