diff -Naur fetchmail-6.2.2.orig/pop3.c fetchmail-6.2.2/pop3.c
--- fetchmail-6.2.2.orig/pop3.c	2003-02-28 17:14:57.000000000 +0530
+++ fetchmail-6.2.2/pop3.c	2003-06-03 17:16:15.000000000 +0530
@@ -249,7 +249,7 @@
 	 */
 	if (ctl->server.authenticate == A_ANY)
 	{
-	    if (capa_probe(sock) != PS_SUCCESS)
+	    if ((ok = capa_probe(sock)) != PS_SUCCESS)
 	    /* we are in STAGE_GETAUTH! */
 		if (ok == PS_AUTHFAIL ||
 		    /* Some servers directly close the socket. However, if we
diff -Naur fetchmail-6.2.2.orig/smtp.c fetchmail-6.2.2/smtp.c
--- fetchmail-6.2.2.orig/smtp.c	2003-03-01 07:44:05.000000000 +0530
+++ fetchmail-6.2.2/smtp.c	2003-06-03 17:18:38.000000000 +0530
@@ -87,7 +87,7 @@
 		SockPrintf(sock, "AUTH CRAM-MD5\r\n");
 		SockRead(sock, smtp_response, sizeof(smtp_response) - 1);
 		strncpy(tmp, smtp_response, sizeof(tmp));
-		tmp[sizeof(tmp)-1] == '\0';
+		tmp[sizeof(tmp)-1] = '\0';
 
 		if (strncmp(tmp, "334 ", 4)) { /* Server rejects AUTH */
 			SMTP_auth_error(sock, GT_("Server rejected the AUTH command.\n"));
@@ -147,7 +147,7 @@
 		SockPrintf(sock, "AUTH LOGIN\r\n");
 		SockRead(sock, smtp_response, sizeof(smtp_response) - 1);
 		strncpy(tmp, smtp_response, sizeof(tmp));
-		tmp[sizeof(tmp)-1] == '\0';
+		tmp[sizeof(tmp)-1] = '\0';
 
 		if (strncmp(tmp, "334 ", 4)) { /* Server rejects AUTH */
 			SMTP_auth_error(sock, GT_("Server rejected the AUTH command.\n"));
@@ -164,7 +164,7 @@
 		SockPrintf(sock, "%s\r\n", b64buf);
 		SockRead(sock, smtp_response, sizeof(smtp_response) - 1);
 		strncpy(tmp, smtp_response, sizeof(tmp));
-		tmp[sizeof(tmp)-1] == '\0';
+		tmp[sizeof(tmp)-1] = '\0';
 		p = strchr(tmp, ' ');
 		if (!p) {
 			SMTP_auth_error(sock, GT_("Bad base64 reply from server.\n"));
@@ -213,7 +213,7 @@
 	      *opt |= hp->value;
 	      if (strncmp(hp->name, "AUTH ", 5) == 0)
 	      	strncpy(auth_response, smtp_response, sizeof(auth_response));
-		auth_response[sizeof(auth_response)-1] == '\0';
+		auth_response[sizeof(auth_response)-1] = '\0';
 	  }
       if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ') {
 	  if (*opt & ESMTP_AUTH)