Escape literal leading full stop in man/new.man.

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 70d710446a40deca875817fa080edd5b2eed7722..ebb9b18f538f71a793366707867f71df8b009c9c 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -15,10 +15,8 @@
 #include <h/signals.h>
 
 #define        TRM     "."
 #include <h/signals.h>
 
 #define        TRM     "."

-#define        TRMLEN  (sizeof TRM - 1)

 
 static int poprint = 0;
 
 static int poprint = 0;

-static int pophack = 0;

 
 char response[BUFSIZ];
 static netsec_context *nsc = NULL;
 
 char response[BUFSIZ];
 static netsec_context *nsc = NULL;


@@ -134,8 +132,8 @@ parse_proxy(char *proxy, char *host)
 }
 
 int
 }
 
 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];
 {
     int fd1, fd2;
     char buffer[BUFSIZ];


@@ -146,6 +144,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     if (user)
        netsec_set_userid(nsc, user);
 
     if (user)
        netsec_set_userid(nsc, user);
 

+    netsec_set_hostname(nsc, host);
+

     if (oauth_svc != NULL) {
        if (netsec_set_oauth_service(nsc, oauth_svc) != OK) {
            snprintf(response, sizeof(response), "OAuth2 not supported");
     if (oauth_svc != NULL) {
        if (netsec_set_oauth_service(nsc, oauth_svc) != OK) {
            snprintf(response, sizeof(response), "OAuth2 not supported");


@@ -213,8 +213,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     netsec_set_fd(nsc, fd1, fd2);
     netsec_set_snoop(nsc, snoop);
 
     netsec_set_fd(nsc, fd1, fd2);
     netsec_set_snoop(nsc, snoop);
 

-    if (tls) {
-       if (netsec_set_tls(nsc, 1, &errstr) != OK) {
+    if (tls & P_INITTLS) {
+       if (netsec_set_tls(nsc, 1, tls & P_NOVERIFY, &errstr) != OK) {

            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;
            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;


@@ -228,8 +228,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
     }
 
     if (sasl) {
     }
 
     if (sasl) {

-       if (netsec_set_sasl_params(nsc, host, "pop", mech,
-                                  pop_sasl_callback, &errstr) != OK) {
+       if (netsec_set_sasl_params(nsc, "pop", mech, pop_sasl_callback,
+                                  &errstr) != OK) {

            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;
            snprintf(response, sizeof(response), "%s", errstr);
            free(errstr);
            return NOTOK;


@@ -241,6 +241,8 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
            if (poprint)
                fprintf (stderr, "<--- %s\n", response);
            if (*response == '+') {
            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)
                if (sasl) {
                    char server_mechs[256];
                    if (check_mech(server_mechs, sizeof(server_mechs)) != OK)


@@ -253,16 +255,24 @@ pop_init (char *host, char *port, char *user, char *pass, char *proxy,
                        return NOTOK;
                    }
                    return OK;
                        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");
            strncpy (response, buffer, sizeof(response));
            }
            strncpy (buffer, response, sizeof(buffer));
            command ("QUIT");
            strncpy (response, buffer, sizeof(response));

-                               /* and fall */
+           /* FALLTHRU */

 
        case NOTOK: 
        case DONE: 
 
        case NOTOK: 
        case DONE: 


@@ -347,6 +357,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);
                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)
                if (rc != OK)
                    return NOTOK;
                if (netsec_flush(nsc, errstr) != OK)


@@ -382,10 +393,12 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            *outdata = NULL;
            *outdatalen = 0;
        } else {
            *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;
            *outdatalen = len;

-           if (rc != OK)
+           if (rc != OK) {
+               netsec_err(errstr, "Unable to decode base64 response");

                return NOTOK;
                return NOTOK;

+           }

        }
        break;
 
        }
        break;
 


@@ -411,8 +424,6 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
 
        if (netsec_flush(nsc, errstr) != OK)
            return NOTOK;
 
        if (netsec_flush(nsc, errstr) != OK)
            return NOTOK;

-
-       return OK;

        break;
 
     /*
        break;
 
     /*


@@ -424,7 +435,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
        if (line == NULL)
            return NOTOK;
 
        if (line == NULL)
            return NOTOK;
 

-       if (strncmp(line, "+OK", 3) != 0) {
+       if (!has_prefix(line, "+OK")) {

            netsec_err(errstr, "Authentication failed: %s", line);
            return NOTOK;
        }
            netsec_err(errstr, "Authentication failed: %s", line);
            return NOTOK;
        }


@@ -447,7 +458,8 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
            return NOTOK;
        break;
     }
            return NOTOK;
        break;
     }

-return OK;
+
+    return OK;

 }
 
 /*
 }
 
 /*


@@ -531,7 +543,7 @@ pop_retr (int msgno, int (*action)(char *))
 static int
 traverse (int (*action)(char *), const char *fmt, ...)
 {
 static int
 traverse (int (*action)(char *), const char *fmt, ...)
 {

-    int result;
+    int result, snoopstate;

     va_list ap;
     char buffer[sizeof(response)];
 
     va_list ap;
     char buffer[sizeof(response)];
 


@@ -543,13 +555,18 @@ traverse (int (*action)(char *), const char *fmt, ...)
        return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 
        return NOTOK;
     strncpy (buffer, response, sizeof(buffer));
 

+    if ((snoopstate = netsec_get_snoop(nsc)))
+       netsec_set_snoop(nsc, 0);
+

     for (;;)
        switch (multiline ()) {
            case NOTOK: 
     for (;;)
        switch (multiline ()) {
            case NOTOK: 

+               netsec_set_snoop(nsc, snoopstate);

                return NOTOK;
 
            case DONE: 
                strncpy (response, buffer, sizeof(response));
                return NOTOK;
 
            case DONE: 
                strncpy (response, buffer, sizeof(response));

+               netsec_set_snoop(nsc, snoopstate);

                return OK;
 
            case OK: 
                return OK;
 
            case OK: 


@@ -670,15 +687,14 @@ vcommand (const char *fmt, va_list ap)
 int
 multiline (void)
 {
 int
 multiline (void)
 {

-    char buffer[BUFSIZ + TRMLEN];
+    char buffer[BUFSIZ + LEN(TRM)];

 
     if (pop_getline (buffer, sizeof buffer, nsc) != OK)
        return NOTOK;
 
     if (pop_getline (buffer, sizeof buffer, nsc) != OK)
        return NOTOK;

-    if (strncmp (buffer, TRM, TRMLEN) == 0) {
-       if (buffer[TRMLEN] == 0)
+    if (has_prefix(buffer, TRM)) {
+       if (buffer[LEN(TRM)] == 0)

            return DONE;
            return DONE;

-       else
-           strncpy (response, buffer + TRMLEN, sizeof(response));
+        strncpy (response, buffer + LEN(TRM), sizeof(response));

     }
     else
        strncpy (response, buffer, sizeof(response));
     }
     else
        strncpy (response, buffer, sizeof(response));


@@ -719,7 +735,7 @@ pop_getline (char *s, int n, netsec_context *ns)
      * someday.
      */
 
      * 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';
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';