summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2015-05-08 10:07:03 -0600
committerEduardo Chappa <chappa@washington.edu>2015-05-08 10:07:03 -0600
commitc321daf6cf4a68fbe5166584fbf7d3b738d4c291 (patch)
treebd24988fafcaef6ff03cf1bb6fa3580c9f9e0c99
parent78cdd43ac7f0b6b14dddc0a539f50bf2609ebfa5 (diff)
downloadalpine-c321daf6cf4a68fbe5166584fbf7d3b738d4c291.tar.xz
* Change in logic in imap_set_password function to make Alpine ask if
a user wants to save a password before reading the password file. This makes a difference when decrypting a password file, as the password file was attempted to be decrypted before the user was asked if they intended to save such password. Now the logic is that the user will be asked if they intend to save the password, and if they agree, then users will be asked to provide the password to unlock their private key.
-rw-r--r--alpine/imap.c6
-rw-r--r--pith/pine.hlp4
2 files changed, 7 insertions, 3 deletions
diff --git a/alpine/imap.c b/alpine/imap.c
index 9e37a5fe..3c33d1b3 100644
--- a/alpine/imap.c
+++ b/alpine/imap.c
@@ -2925,10 +2925,10 @@ set_passfile_passwd(pinerc, passwd, user, hostlist, altflag, already_prompted)
int altflag, already_prompted;
{
dprint((10, "set_passfile_passwd\n"));
- if((passfile_cache || read_passfile(pinerc, &passfile_cache))
+ if(((already_prompted == 0 && preserve_prompt())
+ || already_prompted == 1)
&& !ps_global->nowrite_password_cache
- && ((already_prompted == 0 && preserve_prompt())
- || already_prompted == 1)){
+ && (passfile_cache || read_passfile(pinerc, &passfile_cache))){
imap_set_passwd(&passfile_cache, passwd, user, hostlist, altflag, 0, 0);
write_passfile(pinerc, passfile_cache);
}
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 820c553a..08e57b91 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -224,10 +224,14 @@ Additions include:
<LI> Make sure titlebar (the line at the top of the screen) always
contains the name of the folder/newsgroup that is open, if this
fits in the title.
+
<LI> The feature <a href="h_config_scramble_message_id">FEATURE: <!--#echo var="FEAT_scramble-message-id"--></a>
will also scramble the name, version and operative system in the message-id header.
Based on a contribution by Dennis Davis, which is itself based on a contribution by
Mark Hills.
+
+ <LI> Change in logic in imap_set_password function to make Alpine ask if
+ a user wants to save a password before reading the password file.
</UL>