summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2012-01-29 16:54:14 +0000
committerEric Faurot <eric@cvs.openbsd.org>2012-01-29 16:54:14 +0000
commit559ba75b64780ee771939d19ecf98010c1c51f29 (patch)
tree2dcb521b422c48b19350a0e080e75dd16fc111a6 /usr.sbin
parent7e7fead7ec274275febb048f787eae27bf1ec74c (diff)
Remove message directories right away instead of moving them to purge/.
Prevent hitting dir entry limits when dealing with lots of mails. ok gilles@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/queue_fsqueue.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue.c b/usr.sbin/smtpd/queue_fsqueue.c
index 23d56e81348..d7312ecae6d 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.36 2012/01/29 10:40:05 eric Exp $ */
+/* $OpenBSD: queue_fsqueue.c,v 1.37 2012/01/29 16:54:13 eric Exp $ */
/*
* Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org>
@@ -361,8 +361,8 @@ fsqueue_message_delete(enum queue_kind qkind, u_int32_t msgid)
fsqueue_message_path(qkind, msgid, rootdir, sizeof(rootdir));
- if (mvpurge(rootdir, PATH_PURGE) == -1)
- fatal("fsqueue_message_delete: mvpurge");
+ if (rmtree(rootdir, 0) == -1)
+ fatal("fsqueue_message_delete: rmtree");
return 1;
}