diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/delivery_lmtp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/enqueue.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/filter_api.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/ioev.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mta.c | 8 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mta_session.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/queue.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/to.c | 4 |
9 files changed, 21 insertions, 21 deletions
diff --git a/usr.sbin/smtpd/delivery_lmtp.c b/usr.sbin/smtpd/delivery_lmtp.c index 5c139fdeb3d..cb598d4cee3 100644 --- a/usr.sbin/smtpd/delivery_lmtp.c +++ b/usr.sbin/smtpd/delivery_lmtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: delivery_lmtp.c,v 1.8 2015/10/10 11:42:49 jung Exp $ */ +/* $OpenBSD: delivery_lmtp.c,v 1.9 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2013 Ashish SHUKLA <ashish.is@lostca.se> @@ -186,14 +186,14 @@ delivery_lmtp_open(struct deliver *deliver) fprintf(fp, "RCPT TO:<%s>\r\n", deliver->user); state = LMTP_RCPT_TO; break; - + case LMTP_RCPT_TO: if (buffer[0] != '2') errx(1, "RCPT TO rejected: %s\n", buffer); fprintf(fp, "DATA\r\n"); state = LMTP_DATA; break; - + case LMTP_DATA: if (buffer[0] != '3') errx(1, "DATA rejected: %s\n", buffer); diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c index ee82bd466db..29b8b2108f9 100644 --- a/usr.sbin/smtpd/enqueue.c +++ b/usr.sbin/smtpd/enqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enqueue.c,v 1.101 2015/10/14 20:51:53 gilles Exp $ */ +/* $OpenBSD: enqueue.c,v 1.102 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2005 Henning Brauer <henning@bulabula.org> @@ -302,7 +302,7 @@ enqueue(int argc, char *argv[], FILE *ofp) if (fout == NULL) err(EX_UNAVAILABLE, "fdopen"); - /* + /* * We need to call get_responses after every command because we don't * support PIPELINING on the server-side yet. */ diff --git a/usr.sbin/smtpd/filter_api.c b/usr.sbin/smtpd/filter_api.c index e4df937aa85..5b82f638608 100644 --- a/usr.sbin/smtpd/filter_api.c +++ b/usr.sbin/smtpd/filter_api.c @@ -1,4 +1,4 @@ -/* $OpenBSD: filter_api.c,v 1.16 2015/01/20 17:37:54 deraadt Exp $ */ +/* $OpenBSD: filter_api.c,v 1.17 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2013 Eric Faurot <eric@openbsd.org> @@ -447,7 +447,7 @@ filter_trigger_eom(struct filter_session *s) filter_name, s->id, s->pipe.iev.sock, s->pipe.oev.sock, s->datalen, s->pipe.idatalen, s->pipe.odatalen); - /* This is called when + /* This is called when * - EOM query is first received * - input data is closed * - output has been written diff --git a/usr.sbin/smtpd/ioev.c b/usr.sbin/smtpd/ioev.c index ebfb613297f..2a5b3ce565d 100644 --- a/usr.sbin/smtpd/ioev.c +++ b/usr.sbin/smtpd/ioev.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ioev.c,v 1.20 2014/12/24 13:51:31 eric Exp $ */ -/* +/* $OpenBSD: ioev.c,v 1.21 2015/10/14 22:01:43 gilles Exp $ */ +/* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index fd127ad2270..a712e8fa4a5 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.177 2015/10/14 19:39:16 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.178 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -654,7 +654,7 @@ lka_addrname(const char *tablename, const struct sockaddr *sa, *res = lk.addrname; return (LKA_OK); } -} +} static int lka_X509_verify(struct ca_vrfy_req_msg *vrfy, diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c index abffbb305ee..24bb10d0607 100644 --- a/usr.sbin/smtpd/mta.c +++ b/usr.sbin/smtpd/mta.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta.c,v 1.191 2015/01/20 17:37:54 deraadt Exp $ */ +/* $OpenBSD: mta.c,v 1.192 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -209,7 +209,7 @@ mta_imsg(struct mproc *p, struct imsg *imsg) relay = mta_relay(&evp); /* ignore if we don't know the limits yet */ - if (relay->limits && + if (relay->limits && relay->ntask >= (size_t)relay->limits->task_hiwat) { if (!(relay->state & RELAY_ONHOLD)) { log_info("smtp-out: hiwat reached on %s: holding envelopes", @@ -1282,7 +1282,7 @@ mta_drain(struct mta_relay *r) char buf[64]; log_debug("debug: mta: draining %s " - "refcount=%d, ntask=%zu, nconnector=%zu, nconn=%zu", + "refcount=%d, ntask=%zu, nconnector=%zu, nconn=%zu", mta_relay_to_text(r), r->refcount, r->ntask, tree_count(&r->connectors), r->nconn); @@ -1469,7 +1469,7 @@ mta_find_route(struct mta_connector *c, time_t now, int *limits, /* * Start looking at MXs on this preference level. - */ + */ #endif level = mx->preference; } diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c index 70d863448e3..96210364d57 100644 --- a/usr.sbin/smtpd/mta_session.c +++ b/usr.sbin/smtpd/mta_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta_session.c,v 1.73 2015/10/09 16:47:14 sunil Exp $ */ +/* $OpenBSD: mta_session.c,v 1.74 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -1484,7 +1484,7 @@ mta_error(struct mta_session *s, const char *fmt, ...) * If not connected yet, and the error is not local, just ignore it * and try to reconnect. */ - if (s->state == MTA_INIT && + if (s->state == MTA_INIT && (errno == ETIMEDOUT || errno == ECONNREFUSED)) { log_debug("debug: mta: not reporting route error yet"); free(error); diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index 66cede63e30..b2349771153 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.167 2015/10/13 11:03:30 gilles Exp $ */ +/* $OpenBSD: queue.c,v 1.168 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -154,7 +154,7 @@ queue_imsg(struct mproc *p, struct imsg *imsg) m_get_id(&m, &reqid); m_get_envelope(&m, &evp); m_end(&m); - + if (evp.id == 0) log_warnx("warn: imsg_queue_submit_envelope: evpid=0"); if (evpid_to_msgid(evp.id) == 0) diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c index 0dbd3e35689..da508a39dd9 100644 --- a/usr.sbin/smtpd/to.c +++ b/usr.sbin/smtpd/to.c @@ -1,4 +1,4 @@ -/* $OpenBSD: to.c,v 1.19 2015/01/20 17:37:54 deraadt Exp $ */ +/* $OpenBSD: to.c,v 1.20 2015/10/14 22:01:43 gilles Exp $ */ /* * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -580,7 +580,7 @@ rule_to_text(struct rule *r) case A_NONE: break; } - + return buf; } |