X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c4f9292be2820445cc4dadac30f54876e24210e3..ff56519f303d58db08eadf5e36356afcc27234fc:/lib/sendmail.c
diff --git a/lib/sendmail.c b/lib/sendmail.c
index 2dc82d0..0c5f4db 100644
--- a/lib/sendmail.c
+++ b/lib/sendmail.c
@@ -2,22 +2,26 @@
* This file is part of DisOrder
* Copyright (C) 2007-2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * This program 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, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
+ */
+/** @file lib/sendmail.c
+ * @brief Sending email
+ *
+ * Can send email either via a local MTA or by connecting to an SMTP TCP port.
+ * The former is preferred as there is a strong implication that the local MTA
+ * will queue for you than some random TCP SMTP server you found.
*/
-
#include "common.h"
#include
@@ -53,20 +57,20 @@ static int getresponse(const char *tag, FILE *in) {
&& line[2] >= '0' && line[2] <= '9') {
const int rc = 10 * (10 * line[0] + line[1]) + line[2] - 111 * '0';
if(rc >= 400 && rc <= 599)
- error(0, "%s: %s", tag, line);
+ disorder_error(0, "%s: %s", tag, line);
if(line[3] != '-') {
return rc;
}
/* else go round for further response lines */
} else {
- error(0, "%s: malformed response: %s", tag, line);
+ disorder_error(0, "%s: malformed response: %s", tag, line);
return -1;
}
}
if(ferror(in))
- error(errno, "%s: read error", tag);
+ disorder_error(errno, "%s: read error", tag);
else
- error(0, "%s: server closed connection", tag);
+ disorder_error(0, "%s: server closed connection", tag);
return -1;
}
@@ -89,7 +93,7 @@ static int sendcommand(const char *tag, FILE *out, const char *fmt, ...) {
rc = fflush(out);
if(rc >= 0)
return 0;
- error(errno, "%s: write error", tag);
+ disorder_error(errno, "%s: write error", tag);
return -1;
}
@@ -114,7 +118,7 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
const char *encoding,
const char *content_type,
const char *body) {
- int rc, sol = 1;
+ int sol = 1;
const char *ptr;
uint8_t idbuf[20];
char *id;
@@ -122,28 +126,28 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
time_t now;
char date[128];
- time(&now);
+ xtime(&now);
gmtime_r(&now, &ut);
strftime(date, sizeof date, "%a, %d %b %Y %H:%M:%S +0000", &ut);
gcry_create_nonce(idbuf, sizeof idbuf);
id = mime_to_base64(idbuf, sizeof idbuf);
- if((rc = getresponse(tag, in)) / 100 != 2)
+ if(getresponse(tag, in) / 100 != 2)
return -1;
if(sendcommand(tag, out, "HELO %s", local_hostname()))
return -1;
- if((rc = getresponse(tag, in)) / 100 != 2)
+ if(getresponse(tag, in) / 100 != 2)
return -1;
if(sendcommand(tag, out, "MAIL FROM:<%s>", sender))
return -1;
- if((rc = getresponse(tag, in)) / 100 != 2)
+ if(getresponse(tag, in) / 100 != 2)
return -1;
if(sendcommand(tag, out, "RCPT TO:<%s>", recipient))
return -1;
- if((rc = getresponse(tag, in)) / 100 != 2)
+ if(getresponse(tag, in) / 100 != 2)
return -1;
if(sendcommand(tag, out, "DATA", sender))
return -1;
- if((rc = getresponse(tag, in)) / 100 != 3)
+ if(getresponse(tag, in) / 100 != 3)
return -1;
if(fprintf(out, "From: %s\r\n", pubsender) < 0
|| fprintf(out, "To: %s\r\n", recipient) < 0
@@ -155,7 +159,7 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
|| fprintf(out, "Date: %s\r\n", date) < 0
|| fprintf(out, "\r\n") < 0) {
write_error:
- error(errno, "%s: write error", tag);
+ disorder_error(errno, "%s: write error", tag);
return -1;
}
for(ptr = body; *ptr; ++ptr) {
@@ -177,7 +181,7 @@ static int sendmailfp(const char *tag, FILE *in, FILE *out,
if(fprintf(out, ".\r\n") < 0
|| fflush(out) < 0)
goto write_error;
- if((rc = getresponse(tag, in)) / 100 != 2)
+ if(getresponse(tag, in) / 100 != 2)
return -1;
return 0;
}
@@ -233,7 +237,7 @@ int sendmail(const char *sender,
xdup2(outpipe[1], 1);
execlp(config->sendmail,
config->sendmail, "-bs", (char *)0);
- fatal(errno, "executing %s", config->sendmail);
+ disorder_fatal(errno, "executing %s", config->sendmail);
}
xclose(inpipe[0]);
xclose(outpipe[1]);
@@ -249,17 +253,17 @@ int sendmail(const char *sender,
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);
+ disorder_error(errno, "error connecting to %s", tag);
xclose(fdin);
return -1;
}
if((fdout = dup(fdin)) < 0)
- fatal(errno, "error calling dup2");
+ disorder_fatal(errno, "error calling dup2");
}
if(!(in = fdopen(fdin, "rb")))
- fatal(errno, "error calling fdopen");
+ disorder_fatal(errno, "error calling fdopen");
if(!(out = fdopen(fdout, "wb")))
- fatal(errno, "error calling fdopen");
+ disorder_fatal(errno, "error calling fdopen");
rc = sendmailfp(tag, in, out, sender, pubsender, recipient, subject,
encoding, content_type, body);
fclose(in);
@@ -270,9 +274,9 @@ int sendmail(const char *sender,
while(waitpid(pid, &w, 0) < 0 && errno == EINTR)
;
if(w < 0)
- fatal(errno, "error calling waitpid");
+ disorder_fatal(errno, "error calling waitpid");
if(w)
- info("warning: %s -bs: %s", config->sendmail, wstat(w));
+ disorder_info("warning: %s -bs: %s", config->sendmail, wstat(w));
/* Not fatal - we determine success/failure from the SMTP conversation.
* Some MTAs exit nonzero if you don't QUIT, which is just stupidly
* picky. */
@@ -307,7 +311,7 @@ pid_t sendmail_subprocess(const char *sender,
_exit(0);
}
if(pid < 0)
- error(errno, "error calling fork");
+ disorder_error(errno, "error calling fork");
return pid;
}