From 052011996e14f31b4b6651548817c361d5efe8ba Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 9 Jan 2012 15:06:39 +0100 Subject: [PATCH] Add a mail user for dma(8). Reported-by: Tim Darby Tested-by: Max Herrgard Dragonfly-bug: --- etc/Makefile | 4 ++++ etc/ftpusers | 2 +- etc/master.passwd | 2 +- nrelease/gui/etc/master.passwd | 3 +-- nrelease/gui/etc/passwd | 3 +-- nrelease/root/etc/master.passwd | 3 +-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 20ef69e5b7..8c274bc2a0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -105,6 +105,10 @@ remove-obsolete-files: done preupgrade: + (pw -V ${DESTDIR}/etc usershow mail -q > /dev/null) || \ + pw -V ${DESTDIR}/etc useradd mail -u 6 -g 6 \ + -c "Mail user" \ + -d /nonexistent -s /sbin/nologin .if !defined(NO_SENDMAIL) (pw -V ${DESTDIR}/etc groupshow smmsp -q > /dev/null) || \ pw -V ${DESTDIR}/etc groupadd smmsp -g 25 diff --git a/etc/ftpusers b/etc/ftpusers index a266192eff..d5c818588f 100644 --- a/etc/ftpusers +++ b/etc/ftpusers @@ -1,5 +1,4 @@ # $FreeBSD: src/etc/ftpusers,v 1.6.2.3 2002/06/30 17:57:17 des Exp $ -# $DragonFly: src/etc/ftpusers,v 1.7 2008/08/30 16:07:58 hasso Exp $ # # list of users disallowed any ftp access. # read by ftpd(8). @@ -11,6 +10,7 @@ operator bin tty kmem +mail games news man diff --git a/etc/master.passwd b/etc/master.passwd index a0b2e8d175..270c4c0219 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -1,5 +1,4 @@ # $FreeBSD: src/etc/master.passwd,v 1.25.2.6 2002/06/30 17:57:17 des Exp $ -# $DragonFly: src/etc/master.passwd,v 1.7 2008/08/30 16:07:58 hasso Exp $ # root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: @@ -8,6 +7,7 @@ operator:*:2:5::0:0:System &:/:/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin +mail:*:6:6::0:0:Mail user:/nonexistent:/sbin/nologin games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin diff --git a/nrelease/gui/etc/master.passwd b/nrelease/gui/etc/master.passwd index d5afea1619..41feffdf5f 100644 --- a/nrelease/gui/etc/master.passwd +++ b/nrelease/gui/etc/master.passwd @@ -1,5 +1,3 @@ -# $DragonFly: src/nrelease/gui/etc/master.passwd,v 1.1 2008/09/01 21:20:30 swildner Exp $ -# root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: installer::0:0::0:0:Bourne-again Superuser:/root:/usr/sbin/installer @@ -8,6 +6,7 @@ operator:*:2:5::0:0:System &:/:/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin +mail:*:6:6::0:0:Mail user:/nonexistent:/sbin/nologin games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin diff --git a/nrelease/gui/etc/passwd b/nrelease/gui/etc/passwd index 4ff2024e39..7ae3991aaa 100644 --- a/nrelease/gui/etc/passwd +++ b/nrelease/gui/etc/passwd @@ -1,5 +1,3 @@ -# $DragonFly: src/nrelease/gui/etc/passwd,v 1.1 2008/09/01 21:20:30 swildner Exp $ -# root:*:0:0:Charlie &:/root:/usr/pkg/bin/zsh toor:*:0:0:Bourne-again Superuser:/root: installer:*:0:0:Bourne-again Superuser:/root:/usr/sbin/installer @@ -8,6 +6,7 @@ operator:*:2:5:System &:/:/sbin/nologin bin:*:3:7:Binaries Commands and Source:/:/sbin/nologin tty:*:4:65533:Tty Sandbox:/:/sbin/nologin kmem:*:5:65533:KMem Sandbox:/:/sbin/nologin +mail:*:6:6:Mail user:/nonexistent:/sbin/nologin games:*:7:13:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8:News Subsystem:/:/sbin/nologin man:*:9:9:Mister Man Pages:/usr/share/man:/sbin/nologin diff --git a/nrelease/root/etc/master.passwd b/nrelease/root/etc/master.passwd index 2ea65abdb3..41feffdf5f 100644 --- a/nrelease/root/etc/master.passwd +++ b/nrelease/root/etc/master.passwd @@ -1,5 +1,3 @@ -# $DragonFly: src/nrelease/installer/etc/master.passwd,v 1.5 2008/08/31 17:12:13 swildner Exp $ -# root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: installer::0:0::0:0:Bourne-again Superuser:/root:/usr/sbin/installer @@ -8,6 +6,7 @@ operator:*:2:5::0:0:System &:/:/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin +mail:*:6:6::0:0:Mail user:/nonexistent:/sbin/nologin games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin -- 2.41.0