diff options
| author | Charles Longeau <chl@cvs.openbsd.org> | 2012-07-08 18:13:09 +0000 |
|---|---|---|
| committer | Charles Longeau <chl@cvs.openbsd.org> | 2012-07-08 18:13:09 +0000 |
| commit | 2731cffc4e7fc4b7c82f6236cbe1d06e526e1c66 (patch) | |
| tree | 31e7eea25bec04cbb04eaf017c3d71c91bbc5714 /usr.sbin/smtpd/smtpd.h | |
| parent | 09e5f10b5c044b3efb849496e30387c3a581bf1f (diff) | |
remove enum queue_kind from queue_fsqueue.c.
incoming messages are now always stored in /incoming, whatever the queue_backend is.
remove QOP_FD_RW and fsqueue_message_fd_rw().
while there check return value of generated paths before calling rmtree()
with advice from gilles@ and eric@
ok gilles@ eric@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index f3df0852c1a..c15cf9498f4 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.302 2012/07/02 17:00:05 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.303 2012/07/08 18:13:08 chl Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -67,6 +67,9 @@ #define PATH_SPOOL "/var/spool/smtpd" #define PATH_OFFLINE "/offline" #define PATH_PURGE "/purge" +#define PATH_INCOMING "/incoming" +#define PATH_ENVELOPES "/envelopes" +#define PATH_MESSAGE "/message" /* number of MX records to lookup */ #define MAX_MX_COUNT 10 @@ -894,7 +897,6 @@ enum queue_op { QOP_COMMIT, QOP_LOAD, QOP_FD_R, - QOP_FD_RW, QOP_CORRUPT, }; @@ -1110,6 +1112,9 @@ void queue_commit_envelopes(struct envelope *); u_int32_t queue_generate_msgid(void); u_int64_t queue_generate_evpid(u_int32_t msgid); struct queue_backend *queue_backend_lookup(const char *); +int queue_message_incoming_path(u_int32_t, char *, size_t); +int queue_envelope_incoming_path(u_int64_t, char *, size_t); +int queue_message_incoming_delete(u_int32_t); int queue_message_create(u_int32_t *); int queue_message_delete(u_int32_t); int queue_message_commit(u_int32_t); |