diff options
author | Gilles Chehade <gilles@poolp.org> | 2019-06-24 09:55:29 +0200 |
---|---|---|
committer | Gilles Chehade <gilles@poolp.org> | 2019-06-24 09:55:29 +0200 |
commit | dee95a27c97716996b6b7cebf53e300119ffe48c (patch) | |
tree | e580391353389946b8c90d6d18a74b7af5f6a17d /smtpd/mta_session.c | |
parent | not enrolled yet (diff) | |
download | OpenSMTPD-dee95a27c97716996b6b7cebf53e300119ffe48c.tar.xz OpenSMTPD-dee95a27c97716996b6b7cebf53e300119ffe48c.zip |
sync
Diffstat (limited to 'smtpd/mta_session.c')
-rw-r--r-- | smtpd/mta_session.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/smtpd/mta_session.c b/smtpd/mta_session.c index 266c45e5..1e07b1fe 100644 --- a/smtpd/mta_session.c +++ b/smtpd/mta_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta_session.c,v 1.116 2019/06/12 17:42:53 eric Exp $ */ +/* $OpenBSD: mta_session.c,v 1.117 2019/06/14 19:55:25 eric Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -352,7 +352,7 @@ mta_free(struct mta_session *s) if (s->flags & MTA_HANGON) { log_debug("debug: mta: %p: cancelling hangon timer", s); - runq_cancel(hangon, NULL, s); + runq_cancel(hangon, s); } if (s->io) @@ -700,7 +700,7 @@ mta_enter_state(struct mta_session *s, int newstate) (long long)(s->relay->limits->sessdelay_keepalive - s->hangon)); s->flags |= MTA_HANGON; - runq_schedule(hangon, time(NULL) + 1, NULL, s); + runq_schedule(hangon, 1, s); break; } @@ -1045,9 +1045,8 @@ mta_response(struct mta_session *s, char *line) (long long int)s->relay->limits->sessdelay_transaction); s->hangon = s->relay->limits->sessdelay_transaction -1; s->flags |= MTA_HANGON; - runq_schedule(hangon, time(NULL) - + s->relay->limits->sessdelay_transaction, - NULL, s); + runq_schedule(hangon, + s->relay->limits->sessdelay_transaction, s); } else mta_enter_state(s, MTA_READY); @@ -1061,9 +1060,8 @@ mta_response(struct mta_session *s, char *line) (long long int)s->relay->limits->sessdelay_transaction); s->hangon = s->relay->limits->sessdelay_transaction -1; s->flags |= MTA_HANGON; - runq_schedule(hangon, time(NULL) - + s->relay->limits->sessdelay_transaction, - NULL, s); + runq_schedule(hangon, + s->relay->limits->sessdelay_transaction, s); } else mta_enter_state(s, MTA_READY); |