Use system sendmail if available (rather than SMTP over TCP)

diff --git a/CHANGES.html b/CHANGES.html
index 9a60a44bf30f79ae7714097161e40d57a8b8af50..a0dad8eab7023120e742efeb05f767e3826310f3 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -126,6 +126,10 @@ span.command {
   is possible to define macros to avoid repetition, and the documentation is
   less monolithic (see disorder.cgi(8) as a starting point).</p>
 
   is possible to define macros to avoid repetition, and the documentation is
   less monolithic (see disorder.cgi(8) as a starting point).</p>
 

+  <p>Mail is now sent via the system sendmail program, though it remains
+  possible to use TCP to connect to an SMTP server.  See <tt>sendmail</tt> and
+  <tt>smtp_server</tt> in disorder_config(5).</p>
+  

 </div>
 
 </div>
 </div>
 
 </div>

diff --git a/README b/README
index d9bdde959c6da23dd9166f63d305e7c90ea4c6d1..8aa4ccd5cba9c9743ee9a274a18dad834af5aee7 100644 (file)
--- a/README
+++ b/README
@@ -204,9 +204,15 @@ You need to configure a number of things to make this work:
 
      mail_sender webmaster@example.com
 
 
      mail_sender webmaster@example.com
 

-   By default the web interface sends mail by connecting to the SMTP port of
-   127.0.0.1.  You can override this with the smtp_server directive, for
-   exampler:
+   By default the web interface sends mail via the system sendmail executable
+   (typically /usr/sbin/sendmail or /usr/lib/sendmail).  You can override this
+   with the sendmail directive, for example:
+
+     sendmail /usr/sbin/my-sendmail
+
+   The executable you choose must support the -bs option.  Alternatively you
+   can tell it to connect to an SMTP server via TCP, with the smtp_server
+   directive.  For example:

 
      smtp_server mail.example.com
 
 
      smtp_server mail.example.com
 

diff --git a/configure.ac b/configure.ac
index 345940080f637b8a244dc36600a5f81f93f06894..18380c0351cdb4a6293fc5b010872d11820d5b68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,8 @@ missing_functions=""
 
 AC_DEFINE(_GNU_SOURCE, 1, [required for e.g. strsignal])
 
 
 AC_DEFINE(_GNU_SOURCE, 1, [required for e.g. strsignal])
 

+AC_PATH_PROG([SENDMAIL],[sendmail],[none],[$PATH:/usr/sbin:/usr/lib])
+

 # Macs might have libraries under fink's root
 AC_PATH_PROG([FINK],[fink],[none],[$PATH:/sw/bin])
 if test "x$FINK" != xnone; then
 # Macs might have libraries under fink's root
 AC_PATH_PROG([FINK],[fink],[none],[$PATH:/sw/bin])
 if test "x$FINK" != xnone; then

diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in
index 952b2b99010f88639801e872bf83ef6b13c247e5..ea3a4bfa2894480c9978955f76fc612dc456b9c9 100644 (file)
--- a/doc/disorder_config.5.in
+++ b/doc/disorder_config.5.in
@@ -725,6 +725,12 @@ This must be set if you have online registration enabled.
 Specifies the maximum refresh period in seconds.
 Default 15.
 .TP
 Specifies the maximum refresh period in seconds.
 Default 15.
 .TP

+.B sendmail \fIPATH\fR
+The path to the Sendmail executable.
+This must support the \fB-bs\fR option (Postfix, Exim and Sendmail should all
+work).
+The default is the sendmail executable found at compile time.
+.TP

 .B short_display \fICHARACTERS\fR
 Defines the maximum number of characters to include in a \fBshort\fR name
 part.
 .B short_display \fICHARACTERS\fR
 Defines the maximum number of characters to include in a \fBshort\fR name
 part.


@@ -733,6 +739,7 @@ Default 30.
 .B smtp_server \fIHOSTNAME\fR
 The hostname (or address) of the SMTP server to use for sending mail.
 The default is 127.0.0.1.
 .B smtp_server \fIHOSTNAME\fR
 The hostname (or address) of the SMTP server to use for sending mail.
 The default is 127.0.0.1.

+If \fBsendmail\fR is set then that is used instead.

 .TP
 .B transform \fITYPE\fR \fIREGEXP\fR \fISUBST\fR [\fICONTEXT\fR [\fIREFLAGS\fR]]
 Determines how names are sorted and displayed in track choice displays.
 .TP
 .B transform \fITYPE\fR \fIREGEXP\fR \fISUBST\fR [\fICONTEXT\fR [\fIREFLAGS\fR]]
 Determines how names are sorted and displayed in track choice displays.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ba537926820fa6647e09a90f9ad62cf37380f14a..ce28475d97d02833d8d3ff2d3c4523a021e536ab 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -112,6 +112,7 @@ definitions.h: Makefile
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new

+       echo "#define SENDMAIL \"${SENDMAIL}\"" >> $@.new

        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi

diff --git a/lib/configuration.c b/lib/configuration.c
index c66f66bf04f8c44709a69ad35585349ddd562df1..241d101dc30efa6d131866802777656dcff5177f 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -962,6 +962,7 @@ static const struct conf conf[] = {
   { C2(restrict, restrictions),         &type_restrict,         validate_any },
   { C(sample_format),    &type_sample_format,    validate_sample_format },
   { C(scratch),          &type_string_accum,     validate_isreg },
   { C2(restrict, restrictions),         &type_restrict,         validate_any },
   { C(sample_format),    &type_sample_format,    validate_sample_format },
   { C(scratch),          &type_string_accum,     validate_isreg },

+  { C(sendmail),         &type_string,           validate_isabspath },

   { C(short_display),    &type_integer,          validate_positive },
   { C(signal),           &type_signal,           validate_any },
   { C(smtp_server),      &type_string,           validate_any },
   { C(short_display),    &type_integer,          validate_positive },
   { C(signal),           &type_signal,           validate_any },
   { C(smtp_server),      &type_string,           validate_any },


@@ -1190,6 +1191,8 @@ static struct config *config_default(void) {
   c->dbversion = 2;
   c->cookie_login_lifetime = 86400;
   c->cookie_key_lifetime = 86400 * 7;
   c->dbversion = 2;
   c->cookie_login_lifetime = 86400;
   c->cookie_key_lifetime = 86400 * 7;

+  if(sendmail_binary[0] && strcmp(sendmail_binary, "none"))
+    c->sendmail = xstrdup(sendmail_binary);

   c->smtp_server = xstrdup("127.0.0.1");
   c->new_max = 100;
   c->reminder_interval = 600;          /* 10m */
   c->smtp_server = xstrdup("127.0.0.1");
   c->new_max = 100;
   c->reminder_interval = 600;          /* 10m */

diff --git a/lib/configuration.h b/lib/configuration.h
index 51dc835341221168139f0c5623e1cf2a3f3b1f5e..cc7e1e3756b6d54478795ba90c4d518e3fda620c 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -272,6 +272,9 @@ struct config {
   /** @brief Default rights for a new user */
   char *default_rights;
 
   /** @brief Default rights for a new user */
   char *default_rights;
 

+  /** @brief Path to sendmail executable */
+  char *sendmail;
+

   /** @brief SMTP server for sending mail */
   char *smtp_server;
 
   /** @brief SMTP server for sending mail */
   char *smtp_server;
 

diff --git a/lib/defs.c b/lib/defs.c
index 084bf0a43ef8dbf3de2947ad8f3a43f360f766c4..67f7951934700df6e5f64595c0ef5db9c9a8d9bc 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -49,6 +49,9 @@ const char bindir[] = BINDIR;
 /** @brief System binary directory */
 const char sbindir[] = SBINDIR;
 
 /** @brief System binary directory */
 const char sbindir[] = SBINDIR;
 

+/** @brief System sendmail executable */
+const char sendmail_binary[] = SENDMAIL;
+

 /** @brief Fink binary directory
  *
  * Meaningless if not on a Mac.
 /** @brief Fink binary directory
  *
  * Meaningless if not on a Mac.

diff --git a/lib/defs.h b/lib/defs.h
index 94f70593976ebfb0448d866efdcce3fc0381ab13..73d633e8b655ab43b8fe1e4a9730de3d69a13249 100644 (file)
--- a/lib/defs.h
+++ b/lib/defs.h
@@ -30,6 +30,7 @@ extern const char pkgdatadir[];
 extern const char bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];
 extern const char bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];

+extern const char sendmail_binary[];

 
 #endif /* DEFS_H */
 
 
 #endif /* DEFS_H */
 

diff --git a/lib/sendmail.c b/lib/sendmail.c
index 8f753431c520ce4d41549c1d37915f789daa9cc5..12291b8859a6ee0b71f5a0c29234a15d2ba366e5 100644 (file)
--- a/lib/sendmail.c
+++ b/lib/sendmail.c
@@ -37,6 +37,7 @@
 #include "hostname.h"
 #include "sendmail.h"
 #include "base64.h"
 #include "hostname.h"
 #include "sendmail.h"
 #include "base64.h"

+#include "wstat.h"

 
 /** @brief Get a server response
  * @param tag Server name
 
 /** @brief Get a server response
  * @param tag Server name


@@ -206,6 +207,7 @@ int sendmail(const char *sender,
   char *tag;
   int fdin, fdout, rc;
   FILE *in, *out;
   char *tag;
   int fdin, fdout, rc;
   FILE *in, *out;

+  pid_t pid = -1;

    
   static const struct addrinfo pref = {
     .ai_flags = 0,
    
   static const struct addrinfo pref = {
     .ai_flags = 0,


@@ -215,20 +217,45 @@ int sendmail(const char *sender,
   };
 
   /* Find the SMTP server */
   };
 
   /* Find the SMTP server */

-  a.n = 2;
-  a.s = s;
-  s[0] = config->smtp_server;
-  s[1] = (char *)"smtp";
-  if(!(ai = get_address(&a, &pref, &tag)))
-    return -1;
-  fdin = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-  if(connect(fdin, ai->ai_addr, ai->ai_addrlen) < 0) {
-    error(errno, "error connecting to %s", tag);
-    xclose(fdin);
-    return -1;
+  if(config->sendmail && config->sendmail[0]) {
+    int inpipe[2], outpipe[2];
+    
+    /* If it's a path name, use -bs mode.  Exim, Postfix and Sendmail all claim
+     * to support this.  */
+    xpipe(inpipe);                      /* sendmail's stdin */
+    xpipe(outpipe);                     /* sendmail's stdout */
+    if(!(pid = xfork())) {
+      exitfn = _exit;
+      signal(SIGPIPE, SIG_DFL);
+      xdup2(inpipe[0], 0);
+      xclose(inpipe[1]);
+      xclose(outpipe[0]);
+      xdup2(outpipe[1], 1);
+      execlp(config->sendmail,
+             config->sendmail, "-bs", (char *)0);
+      fatal(errno, "executing %s", config->sendmail);
+    }
+    xclose(inpipe[0]);
+    xclose(outpipe[1]);
+    fdin = outpipe[0];                  /* read from sendmail's stdout */
+    fdout = inpipe[1];                  /* write to sendmail's stdin */
+    tag = config->sendmail;
+  } else {
+    a.n = 2;
+    a.s = s;
+    s[0] = config->smtp_server;
+    s[1] = (char *)"smtp";
+    if(!(ai = get_address(&a, &pref, &tag)))
+      return -1;
+    fdin = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+    if(connect(fdin, ai->ai_addr, ai->ai_addrlen) < 0) {
+      error(errno, "error connecting to %s", tag);
+      xclose(fdin);
+      return -1;
+    }
+    if((fdout = dup(fdin)) < 0)
+      fatal(errno, "error calling dup2");

   }
   }

-  if((fdout = dup(fdin)) < 0)
-    fatal(errno, "error calling dup2");

   if(!(in = fdopen(fdin, "rb")))
     fatal(errno, "error calling fdopen");
   if(!(out = fdopen(fdout, "wb")))
   if(!(in = fdopen(fdin, "rb")))
     fatal(errno, "error calling fdopen");
   if(!(out = fdopen(fdout, "wb")))


@@ -237,6 +264,19 @@ int sendmail(const char *sender,
                  encoding, content_type, body);
   fclose(in);
   fclose(out);
                  encoding, content_type, body);
   fclose(in);
   fclose(out);

+  if(pid != -1) {
+    int w;
+
+    while(waitpid(pid, &w, 0) < 0 && errno == EINTR)
+      ;
+    if(w < 0)
+      fatal(errno, "error calling waitpid");
+    if(w) {
+      error(0, "%s -bs: %s", config->sendmail, wstat(w));
+      if(!rc)
+        rc = -1;
+    }
+  }

   return rc;
 }
 
   return rc;
 }
 

diff --git a/scripts/sedfiles.make b/scripts/sedfiles.make
index cbae8c148a7725ec2b1052ba22eb0ec781ba7171..5b7a64975dacbeb5428b8f57be764ab12cd81296 100644 (file)
--- a/scripts/sedfiles.make
+++ b/scripts/sedfiles.make
@@ -25,6 +25,7 @@ $(SEDFILES) : % : %.in Makefile
            -e 's!pkgconfdir!${sysconfdir}/disorder!g;' \
            -e 's!pkgstatedir!${localstatedir}/disorder!g;' \
            -e 's!pkgdatadir!${pkgdatadir}!g;' \
            -e 's!pkgconfdir!${sysconfdir}/disorder!g;' \
            -e 's!pkgstatedir!${localstatedir}/disorder!g;' \
            -e 's!pkgdatadir!${pkgdatadir}!g;' \

+           -e 's!SENDMAIL!${SENDMAIL}!g;' \

            -e 's!_version_!${VERSION}!g;' \
                < $< > $@.new
        @if test -x $<; then \
            -e 's!_version_!${VERSION}!g;' \
                < $< > $@.new
        @if test -x $<; then \