diff options
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/delivery_mbox.c | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/ioev.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/delivery_mbox.c b/usr.sbin/smtpd/delivery_mbox.c index 8fd883cd17e..a915e2be786 100644 --- a/usr.sbin/smtpd/delivery_mbox.c +++ b/usr.sbin/smtpd/delivery_mbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: delivery_mbox.c,v 1.11 2015/01/20 17:37:54 deraadt Exp $ */ +/* $OpenBSD: delivery_mbox.c,v 1.12 2015/12/22 07:54:57 sunil Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org> @@ -58,7 +58,8 @@ delivery_mbox_open(struct deliver *deliver) environ = environ_new; if (deliver->from[0] == '\0') - (void)strlcpy(deliver->from, "MAILER-DAEMON", sizeof deliver->from); + (void)strlcpy(deliver->from, "MAILER-DAEMON", + sizeof deliver->from); execle(PATH_MAILLOCAL, PATH_MAILLOCAL, "-f", deliver->from, deliver->to, (char *)NULL, environ_new); perror("execle"); diff --git a/usr.sbin/smtpd/ioev.c b/usr.sbin/smtpd/ioev.c index 1a51009325e..ad337b78273 100644 --- a/usr.sbin/smtpd/ioev.c +++ b/usr.sbin/smtpd/ioev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioev.c,v 1.22 2015/10/16 21:13:33 sthen Exp $ */ +/* $OpenBSD: ioev.c,v 1.23 2015/12/22 07:54:57 sunil Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -893,7 +893,8 @@ io_reload_ssl(struct io *io) ev = EV_READ; dispatch = io_dispatch_read_ssl; } - else if (IO_WRITING(io) && !(io->flags & IO_PAUSE_OUT) && io_queued(io)) { + else if (IO_WRITING(io) && !(io->flags & IO_PAUSE_OUT) && + io_queued(io)) { ev = EV_WRITE; dispatch = io_dispatch_write_ssl; } |