X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/572cac455e444c60c4f7803d3e4b69fff89b9af2..ccafa1944:/mts/smtp/smtp.c?ds=inline

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
old mode 100644
new mode 100755
index 404c463e..6fd178bc
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -15,6 +15,13 @@
 #ifdef CYRUS_SASL
 #include <sasl/sasl.h>
 #include <sasl/saslutil.h>
+# if SASL_VERSION_FULL < 0x020125
+    /* Cyrus SASL 2.1.25 introduced the sasl_callback_ft prototype,
+       which has an explicit void parameter list, according to best
+       practice.  So we need to cast to avoid compile warnings.
+       Provide this prototype for earlier versions. */
+    typedef int (*sasl_callback_ft)();
+# endif /* SASL_VERSION_FULL < 0x020125 */
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -100,11 +107,11 @@ static int sm_get_user(void *, int, const char **, unsigned *);
 static int sm_get_pass(sasl_conn_t *, void *, int, sasl_secret_t **);
 
 static sasl_callback_t callbacks[] = {
-    { SASL_CB_USER, sm_get_user, NULL },
+    { SASL_CB_USER, (sasl_callback_ft) sm_get_user, NULL },
 #define SM_SASL_N_CB_USER 0
-    { SASL_CB_PASS, sm_get_pass, NULL },
+    { SASL_CB_PASS, (sasl_callback_ft) sm_get_pass, NULL },
 #define SM_SASL_N_CB_PASS 1
-    { SASL_CB_AUTHNAME, sm_get_user, NULL },
+    { SASL_CB_AUTHNAME, (sasl_callback_ft) sm_get_user, NULL },
 #define SM_SASL_N_CB_AUTHNAME 2
     { SASL_CB_LIST_END, NULL, NULL },
 };
@@ -791,9 +798,19 @@ sm_end (int type)
 	    if (sm_mts == MTS_SMTP)
 		smtalk (SM_QUIT, "QUIT");
 	    else {
+		/* The SIGPIPE block replaces old calls to discard ().
+		   We're not sure what the discard () calls were for,
+		   maybe to prevent deadlock on old systems.  In any
+		   case, blocking SIGPIPE should be harmless.
+		   Because the file handles are closed below, leave it
+		   blocked. */
+		sigset_t set, oset;
+		sigemptyset (&set);
+		sigaddset (&set, SIGPIPE);
+		sigprocmask (SIG_BLOCK, &set, &oset);
+
 		kill (sm_child, SIGKILL);
-		discard (sm_rfp);
-		discard (sm_wfp);
+		sm_child = NOTOK;
 	    }
 	    if (type == NOTOK) {
 		sm_reply.code = sm_note.code;
@@ -833,9 +850,11 @@ sm_end (int type)
 	if (sasl_inbuffer)
 	    free(sasl_inbuffer);
 #endif /* CYRUS_SASL */
-    } else {
+    } else if (sm_child != NOTOK) {
 	status = pidwait (sm_child, OK);
 	sm_child = NOTOK;
+    } else {
+	status = OK;
     }
 
     sm_rfp = sm_wfp = NULL;