From 74eb0be1e799d5485fae6e9c82fddc4d4b785df5 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 22 Sep 1999 02:00:17 +0000 Subject: Added Todd Sabin's new protocol options. svn path=/trunk/; revision=2571 --- imap.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'imap.c') diff --git a/imap.c b/imap.c index f947c870..24066fa1 100644 --- a/imap.c +++ b/imap.c @@ -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 -- cgit v1.2.3