Note Earl's regression fix for SSL_CTX_clear_options() on older OpenSSL.

[~andy/fetchmail] / pop2.c

diff --git a/pop2.c b/pop2.c
index 8615c59a410d5dd9ad414f5e38f262741a2c8d00..03d58a18f92334be44b0c57bd5774e1cf6893d18 100644 (file)
--- a/pop2.c
+++ b/pop2.c
@@ -5,18 +5,23 @@
  * For license terms, see the file COPYING in this directory.
  */
 
-#include  <config.h>
+#include  "config.h"
+
 #ifdef POP2_ENABLE
 #include  <stdio.h>
 #if defined(STDC_HEADERS)
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include  "fetchmail.h"
 #include  "socket.h"
+#include  "i18n.h"
 
 static int pound_arg, equal_arg;
 
-int pop2_ok (int sock, char *argbuf)
+static int pop2_ok (int sock, char *argbuf)
 /* parse POP2 command response */
 {
     int ok;
@@ -50,17 +55,40 @@ int pop2_ok (int sock, char *argbuf)
     return(ok);
 }
 
-int pop2_getauth(int sock, struct query *ctl, char *buf)
+static int pop2_getauth(int sock, struct query *ctl, char *buf)
 /* apply for connection authorization */
 {
-    return(gen_transact(sock,
+    int status;
+
+    (void)buf;
+
+    if (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1") && !ctl->use_ssl)
+    {
+       report(stderr, GT_("POP2 does not support STLS. Giving up.\n"));
+       return PS_SOCKET;
+    }
+
+    if (ctl->server.authenticate != A_ANY && ctl->server.authenticate != A_PASSWORD)
+    {
+       report(stderr, GT_("POP2 only supports password authentication. Giving up.\n"));
+       return PS_AUTHFAIL;
+    }
+
+    strlcpy(shroud, ctl->password, sizeof(shroud));
+    status = gen_transact(sock,
                  "HELO %s %s",
-                 ctl->remotename, ctl->password));
+                 ctl->remotename, ctl->password);
+    memset(shroud, 0x55, sizeof(shroud));
+    shroud[0] = '\0';
+    return status;
 }
 
-static int pop2_getrange(int sock, struct query *ctl, const char *folder, int*countp, int*newp)
+static int pop2_getrange(int sock, struct query *ctl, const char *folder, 
+                        int *countp, int *newp, int *bytes)
 /* get range of messages to be fetched */
 {
+    (void)ctl;
+
     /* maybe the user wanted a non-default folder */
     if (folder)
     {
@@ -86,7 +114,7 @@ static int pop2_getrange(int sock, struct query *ctl, const char *folder, int*co
            return(PS_ERROR);
 
     *countp = pound_arg;
-    *newp = -1;
+    *bytes = *newp = -1;
 
     return(0);
 }
@@ -96,6 +124,7 @@ static int pop2_fetch(int sock, struct query *ctl, int number, int *lenp)
 {
     int        ok;
 
+    (void)ctl;
     *lenp = 0;
     ok = gen_transact(sock, "READ %d", number);
     if (ok)
@@ -107,29 +136,42 @@ static int pop2_fetch(int sock, struct query *ctl, int number, int *lenp)
     return(ok);
 }
 
-static int pop2_trail(int sock, struct query *ctl, int number)
+static int pop2_trail(int sock, struct query *ctl, const char *tag)
 /* send acknowledgement for message data */
 {
+    (void)ctl;
+    (void)tag;
     return(gen_transact(sock, ctl->keep ? "ACKS" : "ACKD"));
 }
 
-const static struct method pop2 =
+static int pop2_logout(int sock, struct query *ctl)
+/* send logout command */
+{
+    (void)ctl;
+    return(gen_transact(sock, "QUIT"));
+}
+
+static const struct method pop2 =
 {
     "POP2",                            /* Post Office Protocol v2 */
-    109,                               /* standard POP2 port */
+    "pop2",                            /* standard POP2 port */
+    "pop2",                            /* ssl POP2 port - not */
     FALSE,                             /* this is not a tagged protocol */
     FALSE,                             /* does not use message delimiter */
-    FALSE,                             /* no getsizes method */
     pop2_ok,                           /* parse command response */
     pop2_getauth,                      /* get authorization */
     pop2_getrange,                     /* query range of messages */
     NULL,                              /* no way to get sizes */
+    NULL,                              /* no way to get sizes of subsets */
     NULL,                              /* messages are always new */
     pop2_fetch,                                /* request given message */
     NULL,                              /* no way to fetch body alone */
     pop2_trail,                                /* eat message trailer */
     NULL,                              /* no POP2 delete method */
-    "QUIT",                            /* the POP2 exit command */
+    NULL,                              /* how to mark a message as seen */
+    NULL,                              /* how to end mailbox processing */
+    pop2_logout,                       /* log out, we're done */
+    FALSE                              /* no, we can't re-poll */
 };
 
 int doPOP2 (struct query *ctl)