summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-02-16 10:15:11 +0000
committerJacek Masiulaniec <jacekm@cvs.openbsd.org>2009-02-16 10:15:11 +0000
commit20f5aabbf6ebb1e5c80a5bc6b07158984f707749 (patch)
tree97ff753bfc6c82cce6f7050b9d8dad6cdb9d96b7
parentaca708e8168af5b3c23d27d38a96004d7fdb6e09 (diff)
Don't warn about F_MESSAGE_SCHEDULED flag being present in on-disk version of
the envelope; ok gilles@
-rw-r--r--usr.sbin/smtpd/queue_shared.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/queue_shared.c b/usr.sbin/smtpd/queue_shared.c
index 53f6a74bb36..b44d1aff89d 100644
--- a/usr.sbin/smtpd/queue_shared.c
+++ b/usr.sbin/smtpd/queue_shared.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_shared.c,v 1.8 2009/02/15 13:44:06 jacekm Exp $ */
+/* $OpenBSD: queue_shared.c,v 1.9 2009/02/16 10:15:10 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -694,10 +694,12 @@ display_envelope(struct message *envelope, int flags)
errx(1, "%s: unexpected status 0x%04x", envelope->message_uid,
envelope->status);
- getflag(&envelope->flags, F_MESSAGE_SCHEDULED, "SCHEDULED",
+ getflag(&envelope->flags, F_MESSAGE_AUTHENTICATED, "AUTH",
status, sizeof(status));
getflag(&envelope->flags, F_MESSAGE_PROCESSING, "PROCESSING",
status, sizeof(status));
+ getflag(&envelope->flags, F_MESSAGE_SCHEDULED, "SCHEDULED",
+ status, sizeof(status));
if (envelope->flags)
errx(1, "%s: unexpected flags 0x%04x", envelope->message_uid,