diff options
| author |   eric <eric@openbsd.org> | 2011-11-21 18:57:54 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2011-11-21 18:57:54 +0000 |
| commit | 50caaca62047f2eb38d8b5b445a41ffe75c8cb8c (patch) | |
| tree | e7448f6c3db9f3dbd5c4db0a5fa282cfc4974905 /usr.sbin/smtpd/queue_fsqueue.c | |
| parent | only pull reg.h in when __BSD_VISIBLE || __XPG_VISIBLE >= 420, as (diff) | |
| download | wireguard-openbsd-50caaca62047f2eb38d8b5b445a41ffe75c8cb8c.tar.xz wireguard-openbsd-50caaca62047f2eb38d8b5b445a41ffe75c8cb8c.zip | |
get rid of the "enqueue/" queue; use "incoming/" instead.
ok gilles@ chl@
Diffstat (limited to 'usr.sbin/smtpd/queue_fsqueue.c')
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c index 07aef0aba12..3c95fd1e681 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.20 2011/11/15 23:12:44 gilles Exp $ */ +/* $OpenBSD: queue_fsqueue.c,v 1.21 2011/11/21 18:57:54 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -65,7 +65,6 @@ void *fsqueue_qwalk_new(enum queue_kind, u_int32_t); int fsqueue_qwalk(void *, u_int64_t *); void fsqueue_qwalk_close(void *); -#define PATH_ENQUEUE "/enqueue" #define PATH_INCOMING "/incoming" #define PATH_QUEUE "/queue" #define PATH_PURGE "/purge" @@ -83,9 +82,6 @@ fsqueue_getpath(enum queue_kind kind) case Q_INCOMING: return (PATH_INCOMING); - case Q_ENQUEUE: - return (PATH_ENQUEUE); - case Q_QUEUE: return (PATH_QUEUE); @@ -375,7 +371,7 @@ fsqueue_message_fd_r(enum queue_kind qkind, u_int32_t msgid) int fd; char pathname[MAXPATHLEN]; - if (qkind == Q_ENQUEUE || qkind == Q_INCOMING) { + if (qkind == Q_INCOMING) { if (! bsnprintf(pathname, sizeof(pathname), "%s/%08x/message", fsqueue_getpath(qkind), msgid)) fatal("fsqueue_message_fd_r: snprintf"); @@ -517,7 +513,7 @@ int fsqueue_init(void) { unsigned int n; - char *paths[] = { PATH_INCOMING, PATH_ENQUEUE, PATH_QUEUE, + char *paths[] = { PATH_INCOMING, PATH_QUEUE, PATH_PURGE, PATH_BOUNCE, PATH_CORRUPT }; char path[MAXPATHLEN]; int ret; @@ -646,7 +642,7 @@ fsqueue_qwalk_new(enum queue_kind kind, u_int32_t msgid) if (kind == Q_QUEUE) q->filefn = walk_queue; - if (kind == Q_INCOMING || kind == Q_ENQUEUE || kind == Q_PURGE) + if (kind == Q_INCOMING || kind == Q_PURGE) q->filefn = walk_queue_nobucket; q->dirs[q->level] = opendir(q->path); |