mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
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>
This commit is contained in:
parent
d95553a6b8
commit
6c50a57595
10
imap-send.c
10
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");
|
||||
|
Loading…
Reference in New Issue
Block a user