From d2810620600cae4f37326127e8b6b2551f96d6ed Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 15 Jul 2002 23:47:57 +0000
Subject: [PATCH] 5 new uid/gid sets; millert ok

---
 src/etc/aliases       |  7 ++++++-
 src/etc/group         |  5 +++++
 src/etc/inetd.conf    | 10 +++++-----
 src/etc/master.passwd |  5 +++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/etc/aliases b/src/etc/aliases
index 3bf605b6..c822666d 100644
--- a/src/etc/aliases
+++ b/src/etc/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.9 2002/07/15 22:33:23 millert Exp $
+#	$OpenBSD: aliases,v 1.10 2002/07/15 23:47:57 deraadt Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /bin/mail.
@@ -26,6 +26,11 @@ popa3d: root
 proxy:  root
 smmsp:  root
 sshd:   root
+_portmap: root
+_rstatd: root
+_identd: root
+_rusersd: root
+_fingerd: root
 
 # Well-known aliases -- these should be filled in!
 # root:
diff --git a/src/etc/group b/src/etc/group
index 49d1ebb3..ef3a0738 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -14,7 +14,12 @@ staff:*:20:root
 smmsp:*:25:
 popa3d:*:26:
 sshd:*:27:
+_portmap:*:28:
+_identd:*:29:
+_rstatd:*:30:
 guest:*:31:root
+_rusersd:*:32:
+_fingerd:*:33:
 utmp:*:45:
 crontab:*:66:
 www:*:67:
diff --git a/src/etc/inetd.conf b/src/etc/inetd.conf
index 2c8793c1..b189f348 100644
--- a/src/etc/inetd.conf
+++ b/src/etc/inetd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: inetd.conf,v 1.48 2002/06/28 22:40:31 deraadt Exp $
+#	$OpenBSD: inetd.conf,v 1.49 2002/07/15 23:47:57 deraadt Exp $
 #
 # Internet server configuration database
 #
@@ -11,10 +11,10 @@
 #shell		stream	tcp	nowait	root	/usr/libexec/rshd	rshd -L
 #shell		stream	tcp6	nowait	root	/usr/libexec/rshd	rshd -L
 #uucpd		stream	tcp	nowait	root	/usr/libexec/uucpd	uucpd
-#finger		stream	tcp	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
-#finger		stream	tcp6	nowait	nobody	/usr/libexec/fingerd	fingerd -lsm
-ident		stream	tcp	nowait	nobody	/usr/libexec/identd	identd -el
-ident		stream	tcp6	nowait	nobody	/usr/libexec/identd	identd -el
+#finger		stream	tcp	nowait	_fingerd /usr/libexec/fingerd	fingerd -lsm
+#finger		stream	tcp6	nowait	_fingerd /usr/libexec/fingerd	fingerd -lsm
+ident		stream	tcp	nowait	_identd	/usr/libexec/identd	identd -el
+ident		stream	tcp6	nowait	_identd	/usr/libexec/identd	identd -el
 #tftp		dgram	udp	wait	root	/usr/libexec/tftpd	tftpd -s /tftpboot
 #tftp		dgram	udp6	wait	root	/usr/libexec/tftpd	tftpd -s /tftpboot
 127.0.0.1:comsat dgram	udp	wait	root	/usr/libexec/comsat	comsat
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index c71c9da8..bf5d852a 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -5,6 +5,11 @@ bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
 smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
 popa3d:*:26:26::0:0:POP3 server:/var/empty:/sbin/nologin
 sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
+_portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin
+_identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin
+_rstatd:*:30:30::0:0:rpc.rstatd:/var/empty:/sbin/nologin
+_rusersd:*:32:32::0:0:rpc.rusersd:/var/empty:/sbin/nologin
+_fingerd:*:33:33::0:0:fingerd:/var/empty:/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