From 586177883d8a2f4b4b7b3388c3d82852f872835e Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Thu, 15 Nov 2018 00:12:04 +0000 Subject: [PATCH 1/3] etc/master.passwd - sync with NetBSD-8 --- etc/master.passwd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/master.passwd b/etc/master.passwd index 33b699d485..5df25d5605 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -2,7 +2,7 @@ root::0:0::0:0:Charlie &:/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root:/bin/sh daemon:*:1:1::0:0:The devil himself:/:/sbin/nologin operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin -bin:*:3:7::0:0:Binaries Commands and Source:/:/bin/sh +bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin games:*:7:13::0:0:& pseudo-user:/usr/games:/sbin/nologin postfix:*:12:12::0:0:& pseudo-user:/var/spool/postfix:/sbin/nologin named:*:14:14::0:0:& pseudo-user:/var/chroot/named:/sbin/nologin @@ -19,6 +19,8 @@ _tests:*:26:26::0:0:& pseudo-user:/nonexistent:/sbin/nologin _tcpdump:*:27:27::0:0:& pseudo-user:/var/chroot/tcpdump:/sbin/nologin _tss:*:28:28::0:0:& pseudo-user:/var/tpm:/sbin/nologin _rtadvd:*:30:30::0:0:& pseudo-user:/var/chroot/rtadvd:/sbin/nologin +_unbound:*:32:32::0:0:& pseudo-user:/var/chroot/unbound:/sbin/nologin +_nsd:*:33:33::0:0:& pseudo-user:/var/chroot/nsd:/sbin/nologin uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin service:*:999:0::0:0:System Services:/:/sbin/nologin nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin From abd9ce64ac24e9150ac9c59fe58083bff437626d Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Thu, 15 Nov 2018 00:24:01 +0000 Subject: [PATCH 2/3] Set the id of the operator group back to ID 5 and document it for a heads up. The uid change was introduced in commit 77e79d33746fa2b709086b9caa51b1415d66c801 --- docs/UPDATING | 5 +++++ etc/group | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/UPDATING b/docs/UPDATING index d2e4ce057a..52721dbab5 100644 --- a/docs/UPDATING +++ b/docs/UPDATING @@ -1,3 +1,8 @@ +20181115: + The "operator" group resumes the ID 5 instead 0 which was a workaround + added with the change here on 20170218. This was a change to ease the + migration from "operator" to "wheel" as the root group. + 20170303: The entire network stack has been replaced. This requires two updates. First, BEFORE rebooting, either before or after rebuilding the system, diff --git a/etc/group b/etc/group index a19780c834..3057ed6b5c 100755 --- a/etc/group +++ b/etc/group @@ -3,7 +3,7 @@ daemon:*:1:daemon kmem:*:2:root sys:*:3:root tty:*:4:root -operator:*:0:root +operator:*:5:root mail:*:6: bin:*:7: wsrc:*:9: @@ -27,6 +27,8 @@ _tss:*:28: _gpio:*:29: _rtadvd:*:30: guest:*:31:root +_unbound:*:32: +_nsd:*:33: nobody:*:39: utmp:*:45: authpf:*:72: From f62d763956467eb8f005ecd13c35a11d8333fccc Mon Sep 17 00:00:00 2001 From: Sevan Janiyan Date: Thu, 15 Nov 2018 00:25:50 +0000 Subject: [PATCH 3/3] Re-assign a shell to the "bin" user account, it is currently needed to run the tests in /usr/tests/minix-posix. --- etc/master.passwd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/master.passwd b/etc/master.passwd index 5df25d5605..b47fce80ec 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -2,7 +2,7 @@ root::0:0::0:0:Charlie &:/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root:/bin/sh daemon:*:1:1::0:0:The devil himself:/:/sbin/nologin operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin -bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin +bin:*:3:7::0:0:Binaries Commands and Source:/:/bin/sh games:*:7:13::0:0:& pseudo-user:/usr/games:/sbin/nologin postfix:*:12:12::0:0:& pseudo-user:/var/spool/postfix:/sbin/nologin named:*:14:14::0:0:& pseudo-user:/var/chroot/named:/sbin/nologin