Browse Source

Remove kerberosV from etc/

ok deraadt@ guenther@
OPENBSD_5_6
reyk 10 years ago
parent
commit
e6ebb39335
5 changed files with 4 additions and 69 deletions
  1. +1
    -4
      src/etc/Makefile
  2. +1
    -3
      src/etc/changelist
  3. +0
    -27
      src/etc/kerberosV/krb5.conf.example
  4. +1
    -32
      src/etc/mtree/4.4BSD.dist
  5. +1
    -3
      src/etc/mtree/special

+ 1
- 4
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.353 2014/04/20 18:06:37 tedu Exp $
# $OpenBSD: Makefile,v 1.354 2014/04/22 10:24:29 reyk Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -162,9 +162,6 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/etc/skel/.cvsrc; \ ${DESTDIR}/etc/skel/.cvsrc; \
${INSTALL} -c -o root -g wheel -m 600 /dev/null \ ${INSTALL} -c -o root -g wheel -m 600 /dev/null \
${DESTDIR}/etc/skel/.ssh/authorized_keys ${DESTDIR}/etc/skel/.ssh/authorized_keys
cd kerberosV; \
${INSTALL} -c -o root -g wheel -m 644 krb5.conf.example \
${DESTDIR}/etc/kerberosV
cd amd; \ cd amd; \
${INSTALL} -c -o root -g wheel -m 644 master.sample \ ${INSTALL} -c -o root -g wheel -m 644 master.sample \
${DESTDIR}/etc/amd ${DESTDIR}/etc/amd


+ 1
- 3
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.85 2014/04/21 08:42:01 ajacoutot Exp $
# $OpenBSD: changelist,v 1.86 2014/04/22 10:24:29 reyk Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -48,7 +48,6 @@
+/etc/isakmpd/isakmpd.policy +/etc/isakmpd/isakmpd.policy
/etc/isakmpd/local.pub /etc/isakmpd/local.pub
+/etc/isakmpd/private/local.key +/etc/isakmpd/private/local.key
/etc/kerberosV/krb5.conf
/etc/ksh.kshrc /etc/ksh.kshrc
/etc/ldapd.conf /etc/ldapd.conf
/etc/ldpd.conf /etc/ldpd.conf
@ -166,7 +165,6 @@
/var/cron/cron.allow /var/cron/cron.allow
/var/cron/cron.deny /var/cron/cron.deny
/var/cron/tabs/root /var/cron/tabs/root
+/var/kerberosV/m-key
/var/named/etc/named.conf /var/named/etc/named.conf
+/var/named/etc/rndc.key +/var/named/etc/rndc.key
/var/named/etc/root.hint /var/named/etc/root.hint


+ 0
- 27
src/etc/kerberosV/krb5.conf.example View File

@ -1,27 +0,0 @@
# $OpenBSD: krb5.conf.example,v 1.7 2013/07/10 05:12:15 ajacoutot Exp $
#
# Kerberos 5 minimal configuration example.
# See krb5.conf(5) and the heimdal info(1) page for more information.
[libdefaults]
# local realm(s)
default_realm = DOMAIN.TLD
[realms]
DOMAIN.TLD = {
# list of KDC(s) for this realm
kdc = kerberos.domain.tld
# admin server for this realm
admin_server = kerberos.domain.tld
}
[kadmin]
# default salt string
default_keys = v5
[logging]
# log to syslog(3)
kdc = SYSLOG:INFO:DAEMON
kpasswdd = SYSLOG:INFO:AUTH
default = SYSLOG:INFO:DAEMON

+ 1
- 32
src/etc/mtree/4.4BSD.dist View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.246 2014/03/24 09:24:09 sthen Exp $
# $OpenBSD: 4.4BSD.dist,v 1.247 2014/04/22 10:24:29 reyk Exp $
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
# . # .
@ -157,11 +157,6 @@ ufqdn uname=root mode=0755
# ./etc/isakmpd # ./etc/isakmpd
.. ..
# ./etc/kerberosV
kerberosV
# ./etc/kerberosV
..
# ./etc/ldap # ./etc/ldap
ldap ldap
@ -312,27 +307,6 @@ std gname=bin uname=root mode=0755
# ./usr/include/g++ # ./usr/include/g++
.. ..
# ./usr/include/kerberosV
kerberosV gname=bin uname=root mode=0755
# ./usr/include/kerberosV/gssapi
gssapi gname=bin uname=root mode=0755
# ./usr/include/kerberosV/gssapi
..
# ./usr/include/kerberosV/kadm5
kadm5 gname=bin uname=root mode=0755
# ./usr/include/kerberosV/kadm5
..
# ./usr/include/kerberosV/krb5
krb5 gname=bin uname=root mode=0755
# ./usr/include/kerberosV/krb5
..
# ./usr/include/kerberosV
..
# ./usr/include/libmilter # ./usr/include/libmilter
libmilter gname=bin uname=root mode=0755 libmilter gname=bin uname=root mode=0755
# ./usr/include/libmilter # ./usr/include/libmilter
@ -1161,11 +1135,6 @@ phantasia uname=root gname=games mode=0775
# ./var/games # ./var/games
.. ..
# ./var/kerberosV
kerberosV uname=root gname=wheel mode=0700
# ./var/kerberosV
..
# ./var/log # ./var/log
log log


+ 1
- 3
src/etc/mtree/special View File

@ -1,4 +1,4 @@
# $OpenBSD: special,v 1.101 2014/04/21 08:42:01 ajacoutot Exp $
# $OpenBSD: special,v 1.102 2014/04/22 10:24:29 reyk Exp $
# $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $ # $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
# @(#)special 8.2 (Berkeley) 1/23/94 # @(#)special 8.2 (Berkeley) 1/23/94
# #
@ -42,8 +42,6 @@ isakmpd type=dir mode=0755 uname=root gname=wheel
isakmpd.conf type=file mode=0600 uname=root gname=wheel optional isakmpd.conf type=file mode=0600 uname=root gname=wheel optional
isakmpd.policy type=file mode=0600 uname=root gname=wheel optional isakmpd.policy type=file mode=0600 uname=root gname=wheel optional
.. #isakmpd .. #isakmpd
kerberosV type=dir mode=0755 uname=root gname=wheel optional ignore
.. #kerberosV
ldapd.conf type=file mode=0600 uname=root gname=wheel ldapd.conf type=file mode=0600 uname=root gname=wheel
ldpd.conf type=file mode=0600 uname=root gname=wheel ldpd.conf type=file mode=0600 uname=root gname=wheel
login.conf type=file mode=0644 uname=root gname=wheel login.conf type=file mode=0644 uname=root gname=wheel


Loading…
Cancel
Save