diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-10-03 07:53:44 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-10-03 07:53:44 +0200 |
| commit | 0e34ace9c0f4c009ecaa222688a3c4bb54b821d4 (patch) | |
| tree | 42267e605de747b204638ae3f0512c36bac9bb47 | |
| parent | sync (diff) | |
| download | OpenSMTPD-0e34ace9c0f4c009ecaa222688a3c4bb54b821d4.tar.xz OpenSMTPD-0e34ace9c0f4c009ecaa222688a3c4bb54b821d4.zip | |
sync
| -rw-r--r-- | smtpd/lka_report.c | 6 | ||||
| -rw-r--r-- | smtpd/mail.lmtp.c | 1 | ||||
| -rw-r--r-- | smtpd/mda.c | 8 | ||||
| -rw-r--r-- | smtpd/mproc.c | 5 |
4 files changed, 11 insertions, 9 deletions
diff --git a/smtpd/lka_report.c b/smtpd/lka_report.c index 109609a5..95562e84 100644 --- a/smtpd/lka_report.c +++ b/smtpd/lka_report.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka_report.c,v 1.33 2019/09/21 08:10:44 semarie Exp $ */ +/* $OpenBSD: lka_report.c,v 1.34 2019/10/03 05:42:57 gilles Exp $ */ /* * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org> @@ -88,11 +88,11 @@ lka_report_init(void) dict_init(&smtp_out); for (i = 0; i < nitems(smtp_events); ++i) { - tailq = xcalloc(1, sizeof (struct reporters *)); + tailq = xcalloc(1, sizeof (struct reporters)); TAILQ_INIT(tailq); dict_xset(&smtp_in, smtp_events[i].event, tailq); - tailq = xcalloc(1, sizeof (struct reporters *)); + tailq = xcalloc(1, sizeof (struct reporters)); TAILQ_INIT(tailq); dict_xset(&smtp_out, smtp_events[i].event, tailq); } diff --git a/smtpd/mail.lmtp.c b/smtpd/mail.lmtp.c index e1759474..c12561cf 100644 --- a/smtpd/mail.lmtp.c +++ b/smtpd/mail.lmtp.c @@ -170,6 +170,7 @@ lmtp_connect_inet(const char *destination) if (s == -1) errx(EX_TEMPFAIL, "%s", cause); + free(destcopy); return fdopen(s, "r+"); } diff --git a/smtpd/mda.c b/smtpd/mda.c index 5ef1337a..6bcf4fa4 100644 --- a/smtpd/mda.c +++ b/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.139 2019/08/10 19:16:01 gilles Exp $ */ +/* $OpenBSD: mda.c,v 1.140 2019/10/03 05:48:33 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -271,9 +271,9 @@ mda_imsg(struct mproc *p, struct imsg *imsg) /* request parent to fork a helper process */ memset(&deliver, 0, sizeof deliver); - text_to_mailaddr(&deliver.sender, s->evp->sender); - text_to_mailaddr(&deliver.rcpt, s->evp->rcpt); - text_to_mailaddr(&deliver.dest, s->evp->dest); + (void)text_to_mailaddr(&deliver.sender, s->evp->sender); + (void)text_to_mailaddr(&deliver.rcpt, s->evp->rcpt); + (void)text_to_mailaddr(&deliver.dest, s->evp->dest); if (s->evp->mda_exec) (void)strlcpy(deliver.mda_exec, s->evp->mda_exec, sizeof deliver.mda_exec); if (s->evp->mda_subaddress) diff --git a/smtpd/mproc.c b/smtpd/mproc.c index 5b824fd6..aa19c7d4 100644 --- a/smtpd/mproc.c +++ b/smtpd/mproc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mproc.c,v 1.34 2019/06/28 13:32:50 deraadt Exp $ */ +/* $OpenBSD: mproc.c,v 1.35 2019/10/03 05:50:28 gilles Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@faurot.net> @@ -365,7 +365,8 @@ m_flush(struct mproc *p) p->m_pos = 0; - imsg_flush(&p->imsgbuf); + if (imsg_flush(&p->imsgbuf) == -1) + fatal("imsg_flush"); } static struct imsg * current; |