X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/984c278593ba8b52cc30caf8d8dfaf184f3c5b4c..cec6ee584ab027c7c536fb0bb62e768b40a4e94c:/uip/popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 9e394287..50cdf09b 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -18,7 +18,6 @@
 #define	TRMLEN	(sizeof TRM - 1)
 
 static int poprint = 0;
-static int pophack = 0;
 
 char response[BUFSIZ];
 static netsec_context *nsc = NULL;
@@ -134,8 +133,8 @@ parse_proxy(char *proxy, char *host)
 }
 
 int
-pop_init (char *host, char *port, char *user, char *pass, char *proxy,
-	  int snoop, int sasl, char *mech, int tls, const char *oauth_svc)
+pop_init (char *host, char *port, char *user, char *proxy, int snoop,
+	  int sasl, char *mech, int tls, const char *oauth_svc)
 {
     int fd1, fd2;
     char buffer[BUFSIZ];
@@ -253,11 +252,21 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
 			return NOTOK;
 		    }
 		    return OK;
-		} else
-		if (command ("USER %s", user) != NOTOK
-		    && command ("%s %s", (pophack++, "PASS"),
-					pass) != NOTOK)
-		return OK;
+		} else {
+		    nmh_creds_t creds;
+
+		    if (!(creds = nmh_get_credentials(host, user)))
+			return NOTOK;
+		    if (command ("USER %s", nmh_cred_get_user(creds))
+		    						!= NOTOK) {
+			if (command("PASS %s", nmh_cred_get_password(creds))
+								!= NOTOK) {
+			    nmh_credentials_free(creds);
+			    return OK;
+			}
+		    }
+		    nmh_credentials_free(creds);
+		}
 	    }
 	    strncpy (buffer, response, sizeof(buffer));
 	    command ("QUIT");
@@ -347,6 +356,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	        rc = netsec_printf(nsc, errstr, "AUTH %s %s\r\n", mech,
 				   b64data);
 		free(b64data);
+		netsec_set_snoop_callback(nsc, NULL, NULL);
 		if (rc != OK)
 		    return NOTOK;
 		if (netsec_flush(nsc, errstr) != OK)
@@ -382,7 +392,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 	    *outdata = NULL;
 	    *outdatalen = 0;
 	} else {
-	    rc = decodeBase64(line + 2, (const char **) outdata, &len, 0, NULL);
+	    rc = decodeBase64(line + 2, outdata, &len, 0, NULL);
 	    *outdatalen = len;
 	    if (rc != OK) {
 		netsec_err(errstr, "Unable to decode base64 response");
@@ -532,7 +542,7 @@ pop_retr (int msgno, int (*action)(char *))
 static int
 traverse (int (*action)(char *), const char *fmt, ...)
 {
-    int result;
+    int result, snoopstate;
     va_list ap;
     char buffer[sizeof(response)];
 
@@ -544,13 +554,18 @@ traverse (int (*action)(char *), const char *fmt, ...)
 	return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 
+    if ((snoopstate = netsec_get_snoop(nsc)))
+	netsec_set_snoop(nsc, 0);
+
     for (;;)
 	switch (multiline ()) {
 	    case NOTOK: 
+		netsec_set_snoop(nsc, snoopstate);
 		return NOTOK;
 
 	    case DONE: 
 		strncpy (response, buffer, sizeof(response));
+		netsec_set_snoop(nsc, snoopstate);
 		return OK;
 
 	    case OK: 
@@ -720,7 +735,7 @@ pop_getline (char *s, int n, netsec_context *ns)
      * someday.
      */
 
-    destlen = len < ((size_t) (n - 1)) ? len : n - 1;
+    destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1);
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';