From: rpe <rpe@openbsd.org>
Date: Sun, 3 Aug 2014 16:00:15 +0000 (+0000)
Subject: smtpd got privsep'ed and the _smtpq user is now used to manage these
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=73d89c5116ec71956ed929d7cc2359d8e95a39bb;p=openbsd

smtpd got privsep'ed and the _smtpq user is now used to manage these
directories. Ensure proper ownership in case smtpd has been started
before this change.

brought up by matthieu@
OK deraadt@
---

diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh
index ab7bae0e47b..4270ba88dcf 100644
--- a/distrib/miniroot/upgrade.sh
+++ b/distrib/miniroot/upgrade.sh
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: upgrade.sh,v 1.77 2014/03/20 20:01:28 krw Exp $
+#	$OpenBSD: upgrade.sh,v 1.78 2014/08/03 16:00:15 rpe Exp $
 #	$NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $
 #
 # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -87,5 +87,12 @@ feed_random
 # Install sets.
 install_sets
 
+# XXX To be removed after 5.6 is released.
+# XXX smtpd got privsep'ed and the _smtpq user is now used to manage these
+# XXX directories. Ensure proper ownership in case smtpd has been started
+# XXX before this change.
+(cd /mnt/var/spool/smtpd &&
+	chown -R 103 corrupt incoming purge queue temporary) 2>/dev/null
+
 # Perform final steps common to both an install and an upgrade.
 finish_up