diff options
| -rw-r--r-- | usr.sbin/smtpd/queue_backend.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c index c4b90c4b4b4..06068ac1d44 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.17 2011/12/19 19:57:25 eric Exp $ */ +/* $OpenBSD: queue_backend.c,v 1.18 2011/12/23 12:10:06 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -101,7 +101,6 @@ queue_message_fd_rw(enum queue_kind qkind, u_int32_t msgid) int queue_envelope_create(enum queue_kind qkind, struct envelope *ep) { - ep->id >>= 32; return env->sc_queue->envelope(qkind, QOP_CREATE, ep); } diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c index dcb63a206b1..8c1d7cf4e16 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.23 2011/12/22 18:41:30 eric Exp $ */ +/* $OpenBSD: queue_fsqueue.c,v 1.24 2011/12/23 12:10:06 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -145,7 +145,7 @@ fsqueue_envelope_create(enum queue_kind qkind, struct envelope *ep) fp = NULL; again: - evpid = queue_generate_evpid(ep->id); + evpid = queue_generate_evpid(evpid_to_msgid(ep->id)); fsqueue_envelope_path(qkind, evpid, evpname, sizeof(evpname)); |