X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/537e02c38f4bb27e746ef51706d26fe40141c5a6..93a064c72892c8ee4e0102517c1e46cbac4fd114:/mts/smtp/smtp.c

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index b7135f54..c18b89b1 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -196,6 +196,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	   int debug, int onex, int queued,
            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {
+    int result, sd1, sd2;
 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */
@@ -204,7 +205,6 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
-    int result, sd1, sd2;
 
     if (watch)
 	verbose = TRUE;
@@ -316,7 +316,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	 */
 
 	if (! sslctx) {
-	    SSL_METHOD *method;
+	    const SSL_METHOD *method;
 
 	    SSL_library_init();
 	    SSL_load_error_strings();
@@ -386,7 +386,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	}
 
 	if (sm_debug) {
-	    SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+	    const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
 	    printf("SSL negotiation successful: %s(%d) %s\n",
 		   SSL_CIPHER_get_name(cipher),
 		   SSL_CIPHER_get_bits(cipher, NULL),
@@ -454,6 +454,9 @@ sendmail_init (char *client, char *server, int watch, int verbose,
                int debug, int onex, int queued,
                int sasl, int saslssf, char *saslmech, char *user)
 {
+    unsigned int i, result, vecp;
+    int pdi[2], pdo[2];
+    char *vec[15];
 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */
@@ -463,9 +466,6 @@ sendmail_init (char *client, char *server, int watch, int verbose,
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
-    unsigned int i, result, vecp;
-    int pdi[2], pdo[2];
-    char *vec[15];
 
     if (watch)
 	verbose = TRUE;
@@ -1115,12 +1115,12 @@ static int
 sm_get_pass(sasl_conn_t *conn, void *context, int id,
 	    sasl_secret_t **psecret)
 {
-    NMH_UNUSED (conn);
-
     char **pw_context = (char **) context;
     char *pass = NULL;
     int len;
 
+    NMH_UNUSED (conn);
+
     if (! psecret || id != SASL_CB_PASS)
 	return SASL_BADPARAM;
 
@@ -1496,7 +1496,7 @@ sm_rrecord (char *buffer, int *len)
     buffer[*len = 0] = 0;
 
     if ((retval = sm_fgets (buffer, BUFSIZ, sm_rfp)) != RP_OK)
-	return retval;
+	return sm_rerror (retval);
     *len = strlen (buffer);
     /* *len should be >0 except on EOF, but check for safety's sake */
     if (*len == 0)