summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2019-07-03 17:35:06 -0600
committerEduardo Chappa <chappa@washington.edu>2019-07-03 17:35:06 -0600
commitd8d2ee522af2fdb67476ca49f05bdcea045f1a73 (patch)
tree1a20cc0ac261affaf70ac890eefff0bc40d39dc8
parent6a96e8c97d54cc4c8591b70032aba8727074e2d9 (diff)
downloadalpine-d8d2ee522af2fdb67476ca49f05bdcea045f1a73.tar.xz
* Fix compilation errors in MacOS. Fix provided by Doug Luce.
-rw-r--r--alpine/imap.c4
-rw-r--r--pith/pine.hlp2
2 files changed, 5 insertions, 1 deletions
diff --git a/alpine/imap.c b/alpine/imap.c
index 0a2a82ab..95081f48 100644
--- a/alpine/imap.c
+++ b/alpine/imap.c
@@ -591,6 +591,7 @@ mm_login_oauth2(NETMBX *mb, char *user, OAUTH2_S *login, long int trial,
altuserforcache ? altuserforcache : user, hostlist,
(mb->sslflag||mb->tlsflag), 0, 0, OA2NAME);
#ifdef LOCAL_PASSWD_CACHE
+#ifdef PASSFILE
/* if requested, remember it on disk for next session */
if(save_password && F_OFF(F_DISABLE_PASSWORD_FILE_SAVING,ps_global))
set_passfile_passwd_auth(ps_global->pinerc, token,
@@ -598,6 +599,7 @@ mm_login_oauth2(NETMBX *mb, char *user, OAUTH2_S *login, long int trial,
(mb->sslflag||mb->tlsflag),
(preserve_password == -1 ? 0
: (preserve_password == 0 ? 2 :1)), OA2NAME);
+#endif /* PASSFILE */
#endif /* LOCAL_PASSWD_CACHE */
ps_global->no_newmail_check_from_optionally_enter = 0;
@@ -1495,6 +1497,7 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
altuserforcache ? altuserforcache : user, hostlist,
(mb->sslflag||mb->tlsflag), 0, 0);
#ifdef LOCAL_PASSWD_CACHE
+#ifdef PASSFILE
/* if requested, remember it on disk for next session */
if(save_password && F_OFF(F_DISABLE_PASSWORD_FILE_SAVING,ps_global))
set_passfile_passwd(ps_global->pinerc, *pwd,
@@ -1502,6 +1505,7 @@ mm_login_work(NETMBX *mb, char *user, char **pwd, long int trial,
(mb->sslflag||mb->tlsflag),
(preserve_password == -1 ? 0
: (preserve_password == 0 ? 2 :1)));
+#endif /* PASSFILE */
#endif /* LOCAL_PASSWD_CACHE */
ps_global->no_newmail_check_from_optionally_enter = 0;
diff --git a/pith/pine.hlp b/pith/pine.hlp
index a6c96964..d4b53abb 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 354 2019-07-03 17:30:21
+Alpine Commit 355 2019-07-03 17:31:39
============= h_news =================
<HTML>
<HEAD>