summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/queue.c
diff options
context:
space:
mode:
authorCharles Longeau <chl@cvs.openbsd.org>2012-07-08 18:13:09 +0000
committerCharles Longeau <chl@cvs.openbsd.org>2012-07-08 18:13:09 +0000
commit2731cffc4e7fc4b7c82f6236cbe1d06e526e1c66 (patch)
tree31e7eea25bec04cbb04eaf017c3d71c91bbc5714 /usr.sbin/smtpd/queue.c
parent09e5f10b5c044b3efb849496e30387c3a581bf1f (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/queue.c')
-rw-r--r--usr.sbin/smtpd/queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 9437e95ca50..6fb660bfb71 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue.c,v 1.119 2012/06/20 20:45:23 eric Exp $ */
+/* $OpenBSD: queue.c,v 1.120 2012/07/08 18:13:08 chl Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -69,7 +69,7 @@ queue_imsg(struct imsgev *iev, struct imsg *imsg)
return;
case IMSG_QUEUE_REMOVE_MESSAGE:
- queue_message_delete(evpid_to_msgid(e->id));
+ queue_message_incoming_delete(evpid_to_msgid(e->id));
return;
case IMSG_QUEUE_COMMIT_MESSAGE: