-/* $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>
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);
-/* $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>
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.
*/
-/* $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>
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
-/* $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
-/* $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>
*res = lk.addrname;
return (LKA_OK);
}
-}
+}
static int
lka_X509_verify(struct ca_vrfy_req_msg *vrfy,
-/* $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>
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",
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);
/*
* Start looking at MXs on this preference level.
- */
+ */
#endif
level = mx->preference;
}
-/* $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>
* 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);
-/* $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>
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)
-/* $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>
case A_NONE:
break;
}
-
+
return buf;
}