Fix some typos and warnings.

diff --git a/sbr/netsec.c b/sbr/netsec.c
index 9e3f3db7c6a88a73d11cabe3d89c5b2d25a073ab..895892a29d29e1346c2ea4454d731bbfc78e027b 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -289,8 +289,9 @@ netsec_b64_snoop_decoder(netsec_context *nsc, const char *string, size_t len,
     const char *decoded;
     size_t decodedlen;
     NMH_UNUSED(nsc);
     const char *decoded;
     size_t decodedlen;
     NMH_UNUSED(nsc);

+    int offset;

 
 

-    int offset = context ? *((int *) context) : 0;
+    offset = context ? *((int *) context) : 0;

 
     if (offset > 0) {
        /*
 
     if (offset > 0) {
        /*


@@ -403,11 +404,11 @@ retry:
            if (nsc->ns_snoop) {
 #ifdef CYRUS_SASL
                if (nsc->sasl_seclayer)
            if (nsc->ns_snoop) {
 #ifdef CYRUS_SASL
                if (nsc->sasl_seclayer)

-                   fprintf(stderr, "(sasl-encrypted) ");
+                   fprintf(stderr, "(sasl-decrypted) ");

 #endif /* CYRUS_SASL */
 #ifdef TLS_SUPPORT
                if (nsc->tls_active)
 #endif /* CYRUS_SASL */
 #ifdef TLS_SUPPORT
                if (nsc->tls_active)

-                   fprintf(stderr, "(tls-encrypted) ");
+                   fprintf(stderr, "(tls-decrypted) ");

 #endif /* TLS_SUPPORT */
                fprintf(stderr, "<= ");
                if (nsc->ns_snoop_cb)
 #endif /* TLS_SUPPORT */
                fprintf(stderr, "<= ");
                if (nsc->ns_snoop_cb)


@@ -917,8 +918,8 @@ netsec_set_sasl_params(netsec_context *nsc, const char *hostname,
        nsc->sasl_mech = getcpy(mechanism);
 
        for (p = nsc->sasl_mech; *p; p++)
        nsc->sasl_mech = getcpy(mechanism);
 
        for (p = nsc->sasl_mech; *p; p++)

-           if (isascii(*p))    /* Just in case */
-               *p = toupper(*p);
+           if (isascii((unsigned char) *p))    /* Just in case */
+               *p = toupper((unsigned char) *p);

     }
 
     nsc->sasl_proto_cb = callback;
     }
 
     nsc->sasl_proto_cb = callback;


@@ -1506,7 +1507,7 @@ netsec_negotiate_tls(netsec_context *nsc, char **errstr)
            fprintf(stderr, "WARNING: cannot determine SSL ciphers\n");
        } else {
            const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
            fprintf(stderr, "WARNING: cannot determine SSL ciphers\n");
        } else {
            const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);

-           fprintf(stderr, "TLS negotation successful: %s(%d) %s\n",
+           fprintf(stderr, "TLS negotiation successful: %s(%d) %s\n",

                    SSL_CIPHER_get_name(cipher),
                    SSL_CIPHER_get_bits(cipher, NULL),
                    SSL_CIPHER_get_version(cipher));
                    SSL_CIPHER_get_name(cipher),
                    SSL_CIPHER_get_bits(cipher, NULL),
                    SSL_CIPHER_get_version(cipher));

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 9e394287501dbc9dd560b243cf25a60cbb35f3b9..ba6003fd33fa54f2dce5817ab50e3ec9e0be2a9d 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -720,7 +720,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';