CRAM now works with POP3!

svn path=/trunk/; revision=3063

diff --git a/pop3.c b/pop3.c
index 39da35c2d7d54d6afb2d2ce6da6d8af55a59cb42..7f0c97986bee4317ad0ec79762957f7d37b4de4a 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -198,6 +198,29 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting)
        }
 #endif /* OPIE_ENABLE */
 
+       /*
+        * AUTH command may return a list of available mechanisms.
+        * if it doesn't, no harm done.  Efficiency hack: most servers
+        * don't implement this, so don't do it at all unless the
+        * server advertises APOP with <> in the greeting line.  This
+        * certainly catches IMAP-2000's POP3 gateway.
+        */
+       if (strchr(greeting, '<') && gen_transact(sock, "AUTH") == 0)
+       {
+           char buffer[10];
+           flag has_cram = FALSE;
+
+           while ((ok = gen_recv(sock, buffer, sizeof(buffer))) == 0)
+           {
+               if (DOTLINE(buffer))
+                   break;
+               if (strncasecmp(buffer, "CRAM-MD5", 8) == 0)
+                   has_cram = TRUE;
+           }
+           if (has_cram && !do_cram_md5(sock, "AUTH", ctl))
+               return(PS_SUCCESS);
+       }
+
        /* ordinary validation, no one-time password or RPA */ 
        ok = gen_transact(sock, "PASS %s", ctl->password);
        break;