diff options
| author |   eric <eric@openbsd.org> | 2012-06-01 11:42:34 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2012-06-01 11:42:34 +0000 |
| commit | 8dbeaf78030d859397626dfdd31ea369b51e268f (patch) | |
| tree | 3343d56f76c273a6c994752086f4a9c1f1d426d3 /usr.sbin/smtpd/queue_fsqueue.c | |
| parent | While scrolling, show a message and beep when you reach either end of (diff) | |
| download | wireguard-openbsd-8dbeaf78030d859397626dfdd31ea369b51e268f.tar.xz wireguard-openbsd-8dbeaf78030d859397626dfdd31ea369b51e268f.zip | |
on envelope creation, setup and reset the relevant envelope fields in
the wrapper function rather than in individual backends.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/queue_fsqueue.c')
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c index 7158da0d4e2..2113ae42f6f 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.40 2012/06/01 09:24:58 eric Exp $ */ +/* $OpenBSD: queue_fsqueue.c,v 1.41 2012/06/01 11:42:34 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -187,23 +187,15 @@ fsqueue_envelope_create(enum queue_kind qkind, struct envelope *ep) char evpname[MAXPATHLEN]; u_int64_t evpid; struct stat sb; - int r; again: evpid = queue_generate_evpid(evpid_to_msgid(ep->id)); fsqueue_envelope_path(qkind, evpid, evpname, sizeof(evpname)); if (stat(evpname, &sb) != -1 || errno != ENOENT) goto again; - - ep->creation = time(NULL); ep->id = evpid; - if ((r = fsqueue_envelope_dump_atomic(evpname, ep)) == 0) { - ep->creation = 0; - ep->id = 0; - } - - return (r); + return (fsqueue_envelope_dump_atomic(evpname, ep)); } static int |