From ff9b1a27705ce98f0760000a6469864f7d6a7fdf Mon Sep 17 00:00:00 2001
From: millert <>
Date: Tue, 11 Sep 2001 19:03:55 +0000
Subject: [PATCH] Scaffolding to support sendmail 8.12.  Note that the new
 smmsp user/group are *required*.

---
 src/etc/crontab           | 5 ++++-
 src/etc/group             | 1 +
 src/etc/master.passwd     | 1 +
 src/etc/mtree/4.4BSD.dist | 9 +++++++--
 src/etc/mtree/special     | 7 +++++--
 src/etc/rc.conf           | 6 ++++--
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/etc/crontab b/src/etc/crontab
index 66b10c59..66d72b80 100644
--- a/src/etc/crontab
+++ b/src/etc/crontab
@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.8 2000/12/29 14:38:45 angelos Exp $
+#	$OpenBSD: crontab,v 1.9 2001/09/11 19:03:55 millert Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -10,6 +10,9 @@ HOME=/var/log
 #
 */10	*	*	*	*	/usr/libexec/atrun
 #
+# sendmail clientmqueue runner
+*/30	*	*	*	*	/usr/sbin/sendmail -L sm-msp-queue -Ac -q
+#
 # rotate log files every hour, if necessary
 0	*	*	*	*	/usr/bin/newsyslog
 # send log file notifications, if necessary
diff --git a/src/etc/group b/src/etc/group
index 695c652a..a5e0396b 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -11,6 +11,7 @@ users:*:10:
 auth:*:11:
 games:*:13:
 staff:*:20:root
+smmsp:*:25:
 guest:*:31:root
 utmp:*:45:
 www:*:67:
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 988a168a..53daff2f 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -2,6 +2,7 @@ root::0:0:daemon:0:0:Charlie &:/root:/bin/csh
 daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
 operator:*:2:5::0:0:System &:/operator:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
+smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/usr/libexec/uucp/uucico
 www:*:67:67::0:0:HTTP server:/var/www:/sbin/nologin
 named:*:70:70::0:0:BIND Name Service Daemon:/var/named:/sbin/nologin
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 4dd17c42..093f61be 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.112 2001/09/09 16:50:14 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.113 2001/09/11 19:03:55 millert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -2021,6 +2021,11 @@ rwho
 # ./var/spool
 spool
 
+# ./var/spool/clientmqueue
+clientmqueue	mode=0770 uname=smmsp gname=smmsp
+# ./var/spool/clientmqueue
+..
+
 # ./var/spool/ftp
 ftp		mode=0555
 
@@ -2058,7 +2063,7 @@ lpd
 ..
 
 # ./var/spool/mqueue
-mqueue
+mqueue		mode=0700
 # ./var/spool/mqueue
 ..
 
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index 25796d61..09fab85f 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.37 2001/09/10 09:13:37 jakob Exp $
+#	$OpenBSD: special,v 1.38 2001/09/11 19:03:55 millert Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -47,6 +47,7 @@ mail		type=dir mode=0755 uname=root gname=wheel
 aliases		type=file mode=0644 uname=root gname=wheel optional
 aliases.db	type=file mode=0644 uname=root gname=wheel optional
 sendmail.cf	type=file mode=0644 uname=root gname=wheel optional
+submit.cf	type=file mode=0644 uname=root gname=wheel optional
 ..	#mail
 mtree		type=dir mode=0755 uname=root gname=wheel
 special		type=file mode=0600 uname=root gname=wheel
@@ -159,6 +160,8 @@ run		type=dir mode=0755 uname=root gname=wheel
 utmp		type=file mode=0664 uname=root gname=utmp
 ..	#var/run
 spool		type=dir mode=0755 uname=root gname=wheel
+clientmqueue	type=dir mode=0770 uname=smmsp gname=smmsp ignore
+..	#var/spool/clientmqueue
 ftp		type=dir mode=0555 uname=root gname=wheel optional
 bin		type=dir mode=0511 uname=root gname=wheel optional
 ..	#var/spool/ftp/bin
@@ -176,7 +179,7 @@ hidden		type=dir mode=0111 uname=root gname=wheel optional ignore
 pub		type=dir mode=0555 uname=root gname=wheel optional ignore
 ..	#var/spool/ftp/pub
 ..	#var/spool/ftp
-mqueue		type=dir mode=0755 uname=root gname=wheel ignore
+mqueue		type=dir mode=0700 uname=root gname=wheel ignore
 ..	#var/spool/mqueue
 news		type=dir mode=0755 uname=root gname=wheel optional ignore
 ..	#var/spool/news
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 3ea5da3b..3bf0b8cb 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.68 2001/08/22 16:13:14 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.69 2001/09/11 19:03:55 millert Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -11,7 +11,6 @@ rarpd_flags=NO		# for normal use: "-a"
 bootparamd_flags=NO	# for normal use: ""
 rbootd_flags=NO		# for normal use: ""
 sshd_flags=""		# for normal use: ""
-sendmail_flags="-q30m"	# for normal use: "-bd -q30m"
 smtpfwdd_flags=NO	# for normal use: "", and no "-bd" above.
 named_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: name of RFC868 timeserver
@@ -32,6 +31,9 @@ rtsold_flags=NO		# for normal use: interface
 			# be sure to set net.inet6.ip6.accept_rtadv=1
 lpd_flags=NO		# for normal use: "" (or "-l" for debugging)
 
+# For normal use: "-L sm-mta -bd -q30m"
+sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
+
 # Set to NO if ftpd is running out of inetd
 ftpd_flags=NO		# for non-inetd use: "-D"