diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-06-24 09:57:38 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-06-24 09:57:38 +0200 |
| commit | d4c755938cccb03876162c0550b8ebc2d637d345 (patch) | |
| tree | 25d5aa35fe39f5afbf63d9c77081d7081ee96ba9 /smtpd/mta_session.c | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | sync (diff) | |
| download | OpenSMTPD-d4c755938cccb03876162c0550b8ebc2d637d345.tar.xz OpenSMTPD-d4c755938cccb03876162c0550b8ebc2d637d345.zip | |
Merge branch 'master' into portable
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 4d78d740..b616cae5 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> @@ -354,7 +354,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) @@ -702,7 +702,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; } @@ -1047,9 +1047,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); @@ -1063,9 +1062,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); |