test/runpty.c: Add missing exit(3) after child fails to execvp(3).

[nmh] / uip / popsbr.c

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 54aa36843ba7e3e4595347080a0a321909deb2e7..0d655b84613eb8d0d672829e5115f11c9e56d066 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -1,5 +1,4 @@
-/*
- * popsbr.c -- POP client subroutines
+/* popsbr.c -- POP client subroutines
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -144,6 +143,8 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
     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");
@@ -211,8 +212,8 @@ pop_init (char *host, char *port, char *user, char *proxy, int 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;
@@ -226,8 +227,8 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
     }
 
     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;
@@ -270,7 +271,7 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
            strncpy (buffer, response, sizeof(buffer));
            command ("QUIT");
            strncpy (response, buffer, sizeof(response));
-                               /* and fall */
+           /* FALLTHRU */
 
        case NOTOK: 
        case DONE: 
@@ -433,7 +434,7 @@ pop_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
        if (line == NULL)
            return NOTOK;
 
-       if (!HasPrefix(line, "+OK")) {
+       if (!has_prefix(line, "+OK")) {
            netsec_err(errstr, "Authentication failed: %s", line);
            return NOTOK;
        }
@@ -689,7 +690,7 @@ multiline (void)
 
     if (pop_getline (buffer, sizeof buffer, nsc) != OK)
        return NOTOK;
-    if (HasPrefix(buffer, TRM)) {
+    if (has_prefix(buffer, TRM)) {
        if (buffer[LEN(TRM)] == 0)
            return DONE;
         strncpy (response, buffer + LEN(TRM), sizeof(response));
@@ -729,11 +730,11 @@ pop_getline (char *s, int n, netsec_context *ns)
      *
      * We get a length back from netsec_readline, but the rest of the POP
      * code doesn't handle it; the assumptions are that everything from
-     * the network can be respresented as C strings.  That should get fixed
+     * the network can be represented as C strings.  That should get fixed
      * someday.
      */
 
-    destlen = len < ((size_t) (n - 1)) ? len : (size_t) (n - 1);
+    destlen = min(len, (size_t)(n - 1));
 
     memcpy(s, p, destlen);
     s[destlen] = '\0';