1 files changed, 6 insertions, 0 deletions
diff --git a/pop2.c b/pop2.c
index b8dbb09f..8bfefb4c 100644
--- a/pop2.c
+++ b/pop2.c
@@ -17,6 +17,7 @@
 #endif
 #include  "fetchmail.h"
 #include  "socket.h"
+#include  "i18n.h"
 
 static int pound_arg, equal_arg;
 
@@ -60,6 +61,11 @@ static int pop2_getauth(int sock, struct query *ctl, char *buf)
     int status;
 
     (void)buf;
+    if (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1") && !ctl->use_ssl)
+    {
+	report(stderr, GT_("POP2 does not support STARTTLS. Giving up.\n"));
+	return PS_SOCKET;
+    }
     strlcpy(shroud, ctl->password, sizeof(shroud));
     status = gen_transact(sock,
 		  "HELO %s %s",