summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric@openbsd.org>2014-07-08 13:02:42 +0000
committereric <eric@openbsd.org>2014-07-08 13:02:42 +0000
commit41ac183f034f3e4a3bfe00cb3335db285af707c8 (patch)
treead6e45d06a53fa44e2ec2326855a32c670372a90
parentsync (diff)
downloadwireguard-openbsd-41ac183f034f3e4a3bfe00cb3335db285af707c8.tar.xz
wireguard-openbsd-41ac183f034f3e4a3bfe00cb3335db285af707c8.zip
make sure to clear the WAIT flag when cancelling the connector timeout.
-rw-r--r--usr.sbin/smtpd/mta.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 5cbefcbc13c..a0973cb888b 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.188 2014/07/08 07:59:31 sobrado Exp $ */
+/* $OpenBSD: mta.c,v 1.189 2014/07/08 13:02:42 eric Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -1076,6 +1076,7 @@ mta_connect(struct mta_connector *c)
if (c->flags & CONNECTOR_WAIT) {
log_debug("debug: mta: cancelling connector timeout");
runq_cancel(runq_connector, NULL, c);
+ c->flags &= ~CONNECTOR_WAIT;
}
/* No job. */