diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2011-11-06 16:57:28 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2011-11-06 16:57:28 +0000 |
| commit | dfcc5a0964f3c988ad24a6eb0ac4b354a6af903e (patch) | |
| tree | 01ec16958b7be91a02dada1c48aaeb7242521784 | |
| parent | de6cb6705c5e7c1e86e4751df880ba6fecd753e6 (diff) | |
No need to save/restore the batch_id since the envelope is not dumped
as a structure anymore.
ok chl@ gilles@
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c index 197b8933723..2b76f252308 100644 --- a/usr.sbin/smtpd/queue_fsqueue.c +++ b/usr.sbin/smtpd/queue_fsqueue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_fsqueue.c,v 1.16 2011/10/27 14:32:57 chl Exp $ */ +/* $OpenBSD: queue_fsqueue.c,v 1.17 2011/11/06 16:57:27 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -195,10 +195,6 @@ fsqueue_envelope_update(enum queue_kind qkind, struct envelope *ep) char temp[MAXPATHLEN]; char dest[MAXPATHLEN]; FILE *fp; - u_int64_t batch_id; - - batch_id = ep->batch_id; - ep->batch_id = 0; if (! bsnprintf(temp, sizeof(temp), "%s/envelope.tmp", PATH_QUEUE)) fatalx("fsqueue_envelope_update"); @@ -230,7 +226,6 @@ fsqueue_envelope_update(enum queue_kind qkind, struct envelope *ep) fatal("fsqueue_envelope_update: rename"); } - ep->batch_id = batch_id; return 1; tempfail: @@ -239,7 +234,6 @@ tempfail: if (fp) fclose(fp); - ep->batch_id = batch_id; return 0; } |