X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/ff3b058ac51e9caf5cf1fd310b8a401a97a85582..92fb809beb2963a5b331a59e589430c989c9cbde:/src/mail-sendmail.c?ds=sidebyside

diff --git a/src/mail-sendmail.c b/src/mail-sendmail.c
index bae4926..7c23531 100644
--- a/src/mail-sendmail.c
+++ b/src/mail-sendmail.c
@@ -5,7 +5,7 @@
  *
  * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -68,9 +68,11 @@ send_flowed_text(FILE *where, const char *para)
 void
 mail_send(struct userNode *from, struct handle_info *to, const char *subject, const char *body, int first_time)
 {
+    struct sigaction sv;
     pid_t child;
     int infds[2], outfds[2];
-    const char *fromaddr, *str;
+    const char *fromaddr;
+    const char *str;
 
     /* Grab some config items first. */
     str = conf_get_data("mail/enable", RECDB_QSTRING);
@@ -92,6 +94,11 @@ mail_send(struct userNode *from, struct handle_info *to, const char *subject, co
     } else if (child > 0) {
         return;
     }
+    /* Reset the SIGCHLD signal handler to the default. */
+    memset(&sv, 0, sizeof(sv));
+    sigemptyset(&sv.sa_mask);
+    sv.sa_handler = SIG_DFL;
+    sigaction(SIGCHLD, &sv, NULL);
     /* We're in a child now; must _exit() to die properly. */
     if (pipe(infds) < 0) {
         log_module(MAIN_LOG, LOG_ERROR, "sendmail() child to %s couldn't pipe(infds): %s (%d)", to->email_addr, strerror(errno), errno);