msgchk.c: Remove UUCP tests; unused since `#ifdef MF'.

[nmh] / uip / imaptest.c

diff --git a/uip/imaptest.c b/uip/imaptest.c
index 0e721ce2a8037a080107f1df65b377de183d02d6..2032e671a9f039be78109041048c564a336fcd17 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -216,20 +216,20 @@ main (int argc, char **argv)
 
     if (initialtls || tls) {
        if (netsec_set_tls(nsc, 1, 0, &errstr) != OK)
-           adios(NULL, errstr);
+           adios(NULL, "%s", errstr);
 
        if (initialtls && netsec_negotiate_tls(nsc, &errstr) != OK)
-           adios(NULL, errstr);
+           adios(NULL, "%s", errstr);
     }
 
     if (sasl) {
        if (netsec_set_sasl_params(nsc, "imap", saslmech, imap_sasl_callback,
                                   nsc, &errstr) != OK)
-           adios(NULL, errstr);
+           adios(NULL, "%s", errstr);
     }
 
     if ((cp = netsec_readline(nsc, &len, &errstr)) == NULL) {
-       adios(NULL, errstr);
+       adios(NULL, "%s", errstr);
     }
 
     if (has_prefix(cp, "* BYE")) {
@@ -295,7 +295,7 @@ main (int argc, char **argv)
            goto finish;
        }
        if (netsec_negotiate_tls(nsc, &errstr) != OK) {
-           adios(NULL, errstr);
+           adios(NULL, "%s", errstr);
        }
     }
 
@@ -597,6 +597,7 @@ imap_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
      */
 
     case NETSEC_SASL_FINISH:
+        line = NULL;
        if (get_imap_response(nsc, NULL, NULL, &line, 1, errstr) != OK)
            return NOTOK;
        /*
@@ -604,7 +605,7 @@ imap_sasl_callback(enum sasl_message_type mtype, unsigned const char *indata,
         * parse it.
         */
 
-       if (has_prefix(line, "OK [CAPABILITY ")) {
+       if (line && has_prefix(line, "OK [CAPABILITY ")) {
            char *p = line + 15, *q;
            q = strchr(p, ']');