Fix a logfile dump bug.

svn path=/trunk/; revision=2614

diff --git a/NEWS b/NEWS
index bcc4af47129378ba7f50acb990472f6db62adca0..98b7eaffcbc2b522e6b594ffaaea6fedf6b29167 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,9 @@ fetchmail-5.1.1 ():
 * During IMAP authentication, canonicalize both name and password.
 * -A has been retired (goes with authenticate -> preauthenticate change).
 * Check for both fetchall and keep on in daemon mode; reject this.
+* Fixed a logfile bug dumping IMAP-LOGIN and IMAP-CRAM-MD5.
 
-There are 259 people on fetchmail-friends and 445 on fetchmail-announce.
+There are 262 people on fetchmail-friends and 443 on fetchmail-announce.
 
 ------------------------------------------------------------------------------
 fetchmail-5.1.0 (Wed Sep 22 01:27:42 EDT 1999), 17767 lines:

diff --git a/env.c b/env.c
index ce4a1a09365f0a2aa92d2575605464d94f58fc88..f41408817a8e9bad38d4d4844b3925393b715f96 100644 (file)
--- a/env.c
+++ b/env.c
@@ -199,6 +199,8 @@ const char *showproto(int proto)
 #ifdef GSSAPI
     case P_IMAP_GSS: return("IMAP-GSS");
 #endif /* GSSAPI */
+    case P_IMAP_CRAM_MD5: return("IMAP-LOGIN");
+    case P_IMAP_LOGIN: return("IMAP-LOGIN");
     case P_APOP: return("APOP");
     case P_RPOP: return("RPOP");
     case P_ETRN: return("ETRN");

diff --git a/fetchmail.h b/fetchmail.h
index 31db1b4c96b53dff46173ca589a354b672fbe913..65ea3d430503966f5288c4a1e1913b1383bf618f 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -9,14 +9,14 @@
 #define                P_AUTO          1
 #define                P_POP2          2
 #define                P_POP3          3
-#define                P_IMAP          4
-#define                P_IMAP_K4       5
-#define                P_IMAP_GSS      6
-#define                P_APOP          7
-#define                P_RPOP          8
-#define                P_ETRN          9
-#define                P_IMAP_CRAM_MD5 10
-#define                P_IMAP_LOGIN    11
+#define                P_APOP          4
+#define                P_RPOP          5
+#define                P_IMAP          6
+#define                P_IMAP_K4       7
+#define                P_IMAP_GSS      8
+#define                P_IMAP_CRAM_MD5 9
+#define                P_IMAP_LOGIN    10
+#define                P_ETRN          11
 
 #if INET6
 #define                SMTP_PORT       "smtp"