diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 1999-09-22 02:00:17 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 1999-09-22 02:00:17 +0000 |
| commit | 74eb0be1e799d5485fae6e9c82fddc4d4b785df5 (patch) | |
| tree | fc00a64c98bd0f5d70e2c3c5fc447e8060164216 /imap.c | |
| parent | 6e6b976915e8c29bf4684b535addf7bd7d83c8b2 (diff) | |
| download | fetchmail-74eb0be1e799d5485fae6e9c82fddc4d4b785df5.tar.gz fetchmail-74eb0be1e799d5485fae6e9c82fddc4d4b785df5.tar.bz2 fetchmail-74eb0be1e799d5485fae6e9c82fddc4d4b785df5.zip | |
Added Todd Sabin's new protocol options.
svn path=/trunk/; revision=2571
Diffstat (limited to 'imap.c')
| -rw-r--r-- | imap.c | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -960,13 +960,22 @@ int imap_getauth(int sock, struct query *ctl, char *greeting) { if (outlevel >= O_DEBUG) report (stdout, _("CRAM-MD5 authentication is supported\n")); - if ((ok = do_cram_md5 (sock, ctl))) + if (ctl->server.protocol != P_IMAP_LOGIN) { - if (outlevel >= O_MONITOR) - report (stdout, "IMAP> *\n"); - SockWrite (sock, "*\r\n", 3); + if ((ok = do_cram_md5 (sock, ctl))) + { + if (outlevel >= O_MONITOR) + report (stdout, "IMAP> *\n"); + SockWrite (sock, "*\r\n", 3); + } + return ok; } - return ok; + } + else if (ctl->server.protocol == P_IMAP_CRAM_MD5) + { + report(stderr, + _("Required CRAM-MD5 capability not supported by server\n")); + return(PS_AUTHFAIL); } #ifdef NTLM_ENABLE |