X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=c18b89b1671b4d3454be72730527664e61dcaf97;hb=c920f1bfe01a74ae5664122628f89016e4e1dac6;hp=620dabc547e9c933e1012a6adb6f4bfc3eaced46;hpb=3bede3fae77775088b8b66e7a26a5e2ee1f61fff;p=mmh

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 620dabc..c18b89b 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -196,14 +196,15 @@ 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 */
     NMH_UNUSED (sasl);
+    NMH_UNUSED (saslssf);
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
-    int result, sd1, sd2;
 
     if (watch)
 	verbose = TRUE;
@@ -315,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();
@@ -385,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),
@@ -453,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 */
@@ -462,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;
@@ -638,33 +639,9 @@ rclient (char *server, char *service)
 }
 
 int
-sm_winit (int mode, char *from)
+sm_winit (char *from)
 {
-    char *smtpcom = NULL;
-
-    switch (mode) {
-	case S_MAIL:
-	    smtpcom = "MAIL";
-	    break;
-
-	case S_SEND:
-	    smtpcom = "SEND";
-	    break;
-
-	case S_SOML:
-	    smtpcom = "SOML";
-	    break;
-
-	case S_SAML:
-	    smtpcom = "SAML";
-	    break;
-
-        default:
-            /* Hopefully, we do not get here. */
-            break;
-    }
-
-    switch (smtalk (SM_MAIL, "%s FROM:<%s>", smtpcom, from)) {
+    switch (smtalk (SM_MAIL, "MAIL FROM:<%s>", from)) {
 	case 250: 
 	    sm_addrs = 0;
 	    return RP_OK;
@@ -956,7 +933,8 @@ sm_auth_sasl(char *user, int saslssf, char *mechlist, char *inhost)
 
     memset(&secprops, 0, sizeof(secprops));
     secprops.maxbufsize = SASL_MAXRECVBUF;
-    secprops.max_ssf = tls_active ? 0 : (saslssf != -1 ? saslssf : UINT_MAX);
+    secprops.max_ssf =
+      tls_active ? 0 : (saslssf != -1 ? (unsigned int) saslssf : UINT_MAX);
 
     result = sasl_setprop(conn, SASL_SEC_PROPS, &secprops);
 
@@ -1137,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;
 
@@ -1518,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)