summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2019-08-09 16:00:51 -0600
committerEduardo Chappa <chappa@washington.edu>2019-08-09 16:00:51 -0600
commit635592f1adc92365b297258138640ed146a9122f (patch)
treefe40d893fcb99c276bf868019f6cfb85065d06ec
parent7c5899d54f194bac2eb799706aec08cda8ab7aa3 (diff)
downloadalpine-635592f1adc92365b297258138640ed146a9122f.tar.xz
* Bug: When a user cancels a connection, Alpine returns an empty password
to c-client, which in turn tries an empty password instead of cancelling the connection.
-rw-r--r--alpine/imap.c4
-rw-r--r--pith/pine.hlp2
2 files changed, 2 insertions, 4 deletions
diff --git a/alpine/imap.c b/alpine/imap.c
index 95081f48..164d0050 100644
--- a/alpine/imap.c
+++ b/alpine/imap.c
@@ -1239,7 +1239,6 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
if(rc == 1 || !user[0]) {
ps_global->user_says_cancel = (rc == 1);
user[0] = '\0';
- pwd[0] = '\0';
}
}
else{
@@ -1248,7 +1247,6 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
}
user[NETMAXUSER-1] = '\0';
- pwd[NETMAXPASSWD-1] = '\0';
if(!(user[0] || altuserforcache)){
ps_global->no_newmail_check_from_optionally_enter = 0;
@@ -1468,7 +1466,7 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
rc = optionally_enter(tmp, q_line, 0, NETMAXPASSWD,
prompt, NULL, help, &flags);
#endif /* !_WINDOWS */
- *pwd = cpystr(tmp);
+ if(rc != 1) *pwd = cpystr(tmp);
ps_global->dont_use_init_cmds = save_dont_use;
if(rc == 3) {
diff --git a/pith/pine.hlp b/pith/pine.hlp
index ffcf12a1..50dcf010 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 362 2019-08-01 23:23:44
+Alpine Commit 363 2019-08-09 16:00:40
============= h_news =================
<HTML>
<HEAD>