summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2017-05-12 20:15:52 +0000
committergilles <gilles@openbsd.org>2017-05-12 20:15:52 +0000
commite9c4fe739c38b85ff779024d47db1a7a158904c2 (patch)
tree8ef5af7f1f9372cdb633790c286d58fc4d748890
parentMake copyin(9) and copyout(9) atomic for naturally aligned 32-bit words. (diff)
downloadwireguard-openbsd-e9c4fe739c38b85ff779024d47db1a7a158904c2.tar.xz
wireguard-openbsd-e9c4fe739c38b85ff779024d47db1a7a158904c2.zip
queue is not owned by _smtpd but _smtpq so a bug in lookup process does not
allow read/write of envelopes and messages, unfortunately the purge_task() function which is in charge of garbage collecting left-overs from aborted transactions is still executed as _smtpd preventing it from working. issue reported by Philippe Meunier, fix from Edgar Pettijohn
-rw-r--r--usr.sbin/smtpd/smtpd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 533cd70ecf7..d4182d57075 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.288 2017/01/09 09:53:23 reyk Exp $ */
+/* $OpenBSD: smtpd.c,v 1.289 2017/05/12 20:15:52 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1194,8 +1194,8 @@ purge_task(void)
log_warn("warn: purge_task: fork");
break;
case 0:
- if ((pw = getpwnam(SMTPD_USER)) == NULL)
- fatalx("unknown user " SMTPD_USER);
+ if ((pw = getpwnam(SMTPD_QUEUE_USER)) == NULL)
+ fatalx("unknown user " SMTPD_QUEUE_USER);
if (chroot(PATH_SPOOL PATH_PURGE) == -1)
fatal("smtpd: chroot");
if (chdir("/") == -1)