summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2016-02-27 12:28:17 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2016-02-27 12:28:17 +0000
commit6f097d00803c0cc9d460b506f6fbed828bfd0182 (patch)
tree622e41ceea2c5ebabb0dfe80d384ec12ce9559b7 /distrib/miniroot
parent15a50e45858e49dc945b89ebf9d702b82c4b7250 (diff)
Cleanup the list of usernames that are rejected during installation.
- sendmail, named, popa3d are not part of base anymore and their ports versions use _<username>. - _tftp_proxy and _ftp_proxy are used instead of the proxy user. OK ajacoutot@
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/install.sub6
1 files changed, 2 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index cca7f54ed16..1d9cd4eacb4 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.881 2016/02/27 12:17:03 rpe Exp $
+# $OpenBSD: install.sub,v 1.882 2016/02/27 12:28:16 rpe Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1705,9 +1705,7 @@ user_setup() {
y|yes) _q="No really, what is the lower-case loginname, or 'no'?"
continue
;;
- root|daemon|operator|bin|smmsp|popa3d)
- ;;
- sshd|uucp|www|named|proxy|nobody|ftp)
+ root|daemon|operator|bin|sshd|uucp|www|nobody|ftp)
;;
[a-z]*([a-z0-9_]))
((${#resp} <= 31)) && break