4 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index e62369c3..d034b78d 100644
--- a/NEWS
+++ b/NEWS
@@ -207,6 +207,8 @@ fetchmail 6.3.0 (not yet released officially):
   Bug#329342, Takeshi Hamasaki. (MA)
 * When getaddrinfo() fails resolving a service, log getaddrinfo() error. (MA)
 * Fix bogus "cannot resolve service * to port number" error. Simon Barner. (MA)
+* Failure to set up SSL connections now results in PS_SOCKET. Suggested by
+  Thomas Wolff. Matthias Andree.
 
 # INTERNAL CHANGES
 * Switched to automake. Matthias Andree.
diff --git a/driver.c b/driver.c
index 88add41c..b78baa25 100644
--- a/driver.c
+++ b/driver.c
@@ -1097,7 +1097,7 @@ static int do_session(
 	    ctl->sslcertpath,ctl->sslfingerprint,realhost,ctl->server.pollname) == -1) 
 	{
 	    report(stderr, GT_("SSL connection failed.\n"));
-	    err = PS_AUTHFAIL;
+	    err = PS_SOCKET;
 	    goto cleanUp;
 	}
 	
diff --git a/imap.c b/imap.c
index 933dd132..544d720e 100644
--- a/imap.c
+++ b/imap.c
@@ -367,7 +367,7 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 	       }
                report(stderr,
                       GT_("SSL connection failed.\n"));
-               return(PS_AUTHFAIL);
+               return PS_SOCKET;
            }
 	   did_stls = TRUE;
 
diff --git a/pop3.c b/pop3.c
index c320a620..d830590e 100644
--- a/pop3.c
+++ b/pop3.c
@@ -418,7 +418,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	       }
 	       report(stderr,
 		       GT_("SSL connection failed.\n"));
-		return(PS_AUTHFAIL);
+		return PS_SOCKET;
 	    }
 	   did_stls = TRUE;