diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2010-06-10 19:34:52 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2010-06-10 19:34:52 +0000 |
| commit | c7c886a4b2afb217f78a66469ff3364eec5b8b2e (patch) | |
| tree | 635034009607d1f9f2416a8dffb7566bb8104c15 /usr.sbin/smtpd/queue.c | |
| parent | 6b09f25b8e40028bddd549d1fb46eeb16f880327 (diff) | |
allow configure queue expiry
with help from jacekm@
ok gilles@ jacekm@
Diffstat (limited to 'usr.sbin/smtpd/queue.c')
| -rw-r--r-- | usr.sbin/smtpd/queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index 029dfd3bd39..f6a56da3479 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.87 2010/06/02 19:16:53 chl Exp $ */ +/* $OpenBSD: queue.c,v 1.88 2010/06/10 19:34:51 chl Exp $ */ /* * Copyright (c) 2008-2010 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -741,7 +741,7 @@ queue_mem_init(struct smtpd *env) batch->retry = queue_retry(rq, a.birth, batch->retry); - if (batch->retry > a.birth + SMTPD_EXPIRE) + if (batch->retry > a.birth + env->sc_qexpire) batch->retry = NO_RETRY_EXPIRED; SLIST_INSERT_HEAD(&bhash[a.content_id & 4095], batch, @@ -1077,7 +1077,7 @@ queue_done(int rq, int i) action->id) < 0) fatal("queue: action read error"); batch->retry = queue_retry(rq, a.birth, batch->retry); - if (batch->retry > a.birth + SMTPD_EXPIRE) + if (batch->retry > a.birth + runqs[rq].env->sc_qexpire) batch->retry = NO_RETRY_EXPIRED; queue_schedule(rq, batch); } |