summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/ftpusers5
-rw-r--r--etc/group3
-rw-r--r--etc/mail/aliases5
-rw-r--r--etc/master.passwd3
4 files changed, 2 insertions, 14 deletions
diff --git a/etc/ftpusers b/etc/ftpusers
index a06c90219ec..a15d2c57f37 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $OpenBSD: ftpusers,v 1.45 2013/08/09 16:00:53 ajacoutot Exp $
+# $OpenBSD: ftpusers,v 1.46 2013/08/19 16:31:18 ajacoutot Exp $
#
# list of users disallowed any ftp access.
# read by ftpd(8).
@@ -21,8 +21,6 @@ _rusersd
_fingerd
_x11
_spamd
-_kdc
-_kadmin
_isakmpd
_syslogd
_pflogd
@@ -32,7 +30,6 @@ _dhcp
_mopd
_tftpd
_rbootd
-_afs
_ppp
_ntp
_ftp
diff --git a/etc/group b/etc/group
index d3cf23c9972..218c36215a1 100644
--- a/etc/group
+++ b/etc/group
@@ -23,8 +23,6 @@ _fingerd:*:33:
_sshagnt:*:34:
_x11:*:35:
utmp:*:45:
-_kdc:*:59:
-_kadmin:*:60:
_lkm:*:61:
_spamd:*:62:
_radius:*:63:
@@ -45,7 +43,6 @@ _dhcp:*:77:
_mopd:*:78:
_tftpd:*:79:
_rbootd:*:80:
-_afs:*:81:
_ppp:*:82:
_ntp:*:83:
_ftp:*:84:
diff --git a/etc/mail/aliases b/etc/mail/aliases
index ce94ea2adfe..acf1078ba0e 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,5 +1,5 @@
#
-# $OpenBSD: aliases,v 1.38 2013/08/09 16:00:53 ajacoutot Exp $
+# $OpenBSD: aliases,v 1.39 2013/08/19 16:31:18 ajacoutot Exp $
#
# Aliases in this file will NOT be expanded in the header from
# Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -21,7 +21,6 @@ uucp: root
www: root
# Redirections for pseudo accounts that should not receive mail
-_afs: /dev/null
_bgpd: /dev/null
_dhcp: /dev/null
_dvmrpd: /dev/null
@@ -32,8 +31,6 @@ _identd: /dev/null
_iked: /dev/null
_isakmpd: /dev/null
_iscsid: /dev/null
-_kadmin: /dev/null
-_kdc: /dev/null
_ldapd: /dev/null
_ldpd: /dev/null
_mopd: /dev/null
diff --git a/etc/master.passwd b/etc/master.passwd
index 739f32aff38..488e58c6502 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -11,8 +11,6 @@ _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
_x11:*:35:35::0:0:X Server:/var/empty:/sbin/nologin
-_kdc:*:59:59::0:0:Kerberos Server:/var/empty:/sbin/nologin
-_kadmin:*:60:60::0:0:Kerberos Admin Server:/var/empty:/sbin/nologin
_spamd:*:62:62::0:0:Spam Daemon:/var/empty:/sbin/nologin
uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/sbin/nologin
www:*:67:67::0:0:HTTP Server:/var/www:/sbin/nologin
@@ -27,7 +25,6 @@ _dhcp:*:77:77::0:0:DHCP programs:/var/empty:/sbin/nologin
_mopd:*:78:78::0:0:MOP Daemon:/var/empty:/sbin/nologin
_tftpd:*:79:79::0:0:TFTP Daemon:/var/empty:/sbin/nologin
_rbootd:*:80:80::0:0:rbootd Daemon:/var/empty:/sbin/nologin
-_afs:*:81:81::0:0:afs Daemon:/var/empty:/sbin/nologin
_ppp:*:82:82::0:0:PPP utilities:/var/empty:/sbin/nologin
_ntp:*:83:83::0:0:NTP Daemon:/var/empty:/sbin/nologin
_ftp:*:84:84::0:0:FTP Daemon:/var/empty:/sbin/nologin