Alter HasSuffixC()'s char * to be const.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 8e1394b9e0211470bf0b4f71baff004f3db307bf..54fd24ffe3515a9d9f885cdbb89a11fb6303e933 100644 (file)
--- 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];
@@ -241,6 +240,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
            if (*response == '+') {
+                nmh_creds_t creds;
+
                if (sasl) {
                    char server_mechs[256];
                    if (check_mech(server_mechs, sizeof(server_mechs)) != OK)
@@ -253,11 +254,19 @@ 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;
+               }
+
+                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");
@@ -533,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)];
 
@@ -545,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: 
@@ -679,8 +693,7 @@ multiline (void)
     if (strncmp (buffer, TRM, TRMLEN) == 0) {
        if (buffer[TRMLEN] == 0)
            return DONE;
-       else
-           strncpy (response, buffer + TRMLEN, sizeof(response));
+        strncpy (response, buffer + TRMLEN, sizeof(response));
     }
     else
        strncpy (response, buffer, sizeof(response));