aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-04-08 23:02:24 +0900
committerJunio C Hamano <gitster@pobox.com>2016-04-13 15:28:09 -0700
commit6c50a575952fcffa0df0cb435e9e3f4eab74b1bf (patch)
treec13fa344c1175bce29ccfa27137f7f56e181b95f
parentd95553a6b8c5153f541adcfc3346004e8249b0e6 (diff)
downloadgit-6c50a575952fcffa0df0cb435e9e3f4eab74b1bf.tar.gz
git-6c50a575952fcffa0df0cb435e9e3f4eab74b1bf.tar.xz
imap-send: check for NOLOGIN capability only when using LOGIN command
Don't check for NOLOGIN (LOGINDISABLED) capability when imap.authMethod is specified. LOGINDISABLED capability doesn't forbid using AUTHENTICATE, so it should be allowed, or we can't connect to IMAP servers which only accepts AUTHENTICATE command. Signed-off-by: Kazuki Yamaguchi <k@rhe.jp> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--imap-send.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/imap-send.c b/imap-send.c
index 2c52027c8..30979f0c6 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1095,11 +1095,6 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
srvc->pass = xstrdup(cred.password);
}
- if (CAP(NOLOGIN)) {
- fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n", srvc->user, srvc->host);
- goto bail;
- }
-
if (srvc->auth_method) {
struct imap_cmd_cb cb;
@@ -1123,6 +1118,11 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
goto bail;
}
} else {
+ if (CAP(NOLOGIN)) {
+ fprintf(stderr, "Skipping account %s@%s, server forbids LOGIN\n",
+ srvc->user, srvc->host);
+ goto bail;
+ }
if (!imap->buf.sock.ssl)
imap_warn("*** IMAP Warning *** Password is being "
"sent in the clear\n");