From 8dbeaf78030d859397626dfdd31ea369b51e268f Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 1 Jun 2012 11:42:34 +0000 Subject: on envelope creation, setup and reset the relevant envelope fields in the wrapper function rather than in individual backends. ok gilles@ --- usr.sbin/smtpd/queue_backend.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'usr.sbin/smtpd/queue_backend.c') diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c index ce82d416062..e6ec91bc385 100644 --- a/usr.sbin/smtpd/queue_backend.c +++ b/usr.sbin/smtpd/queue_backend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_backend.c,v 1.20 2012/01/14 15:13:14 chl Exp $ */ +/* $OpenBSD: queue_backend.c,v 1.21 2012/06/01 11:42:34 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade @@ -96,7 +96,15 @@ queue_message_fd_rw(enum queue_kind qkind, u_int32_t msgid) int queue_envelope_create(enum queue_kind qkind, struct envelope *ep) { - return env->sc_queue->envelope(qkind, QOP_CREATE, ep); + int r; + + ep->creation = time(NULL); + r = env->sc_queue->envelope(qkind, QOP_CREATE, ep); + if (!r) { + ep->creation = 0; + ep->id = 0; + } + return (r); } int -- cgit v1.2.3-59-g8ed1b