diff options
| -rw-r--r-- | etc/Makefile | 13 | ||||
| -rw-r--r-- | etc/kerberosIV/README | 35 | ||||
| -rw-r--r-- | etc/kerberosIV/krb.conf | 5 | ||||
| -rw-r--r-- | etc/kerberosIV/krb.equiv | 10 | ||||
| -rw-r--r-- | etc/kerberosIV/krb.extra | 25 | ||||
| -rw-r--r-- | etc/kerberosIV/krb.realms | 13 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 7 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.root | 9 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.usr | 9 | ||||
| -rw-r--r-- | etc/mtree/special | 4 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 4 |
11 files changed, 6 insertions, 128 deletions
diff --git a/etc/Makefile b/etc/Makefile index c2bb7d32bd5..45783f89592 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.182 2003/03/30 07:43:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.183 2003/06/27 21:26:19 david Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -103,17 +103,6 @@ distribution-etc-root-var: distrib-dirs ${DESTDIR}/etc/skel/.profile; \ ${INSTALL} -c -o root -g wheel -m 600 dot.rhosts \ ${DESTDIR}/etc/skel/.rhosts - cd kerberosIV; \ - ${INSTALL} -c -o root -g wheel -m 644 README \ - ${DESTDIR}/etc/kerberosIV; \ - ${INSTALL} -c -o root -g wheel -m 644 krb.conf \ - ${DESTDIR}/etc/kerberosIV; \ - ${INSTALL} -c -o root -g wheel -m 644 krb.realms \ - ${DESTDIR}/etc/kerberosIV; \ - ${INSTALL} -c -o root -g wheel -m 644 krb.extra \ - ${DESTDIR}/etc/kerberosIV; \ - ${INSTALL} -c -o root -g wheel -m 644 krb.equiv \ - ${DESTDIR}/etc/kerberosIV cd kerberosV; \ ${INSTALL} -c -o root -g wheel -m 644 README \ ${DESTDIR}/etc/kerberosV; \ diff --git a/etc/kerberosIV/README b/etc/kerberosIV/README deleted file mode 100644 index f1c8afb0ffe..00000000000 --- a/etc/kerberosIV/README +++ /dev/null @@ -1,35 +0,0 @@ -# from @(#)README 8.1 (Berkeley) 6/9/93 -# $OpenBSD: README,v 1.6 2002/06/09 06:15:15 todd Exp $ - -Notes about the contents of the /etc/kerberosIV directory: - -(Please check the kth-krb infopage for more information about KerberosIV) - -The file master_key contains a copy of the master key under which the -entire KerberosIV database is encrypted. Disclosing this key would be bad -news. The reason it is stored in the filesystem is because the following -programs need to inspect or modify the kereros database, and so the key -must be available for them, (or else it would have to be typed in by -hand): - - kerberos (the server itself) - - kpasswdd (for changing passwords) - - kadmind (database administration server) - -The srvtab file contains the encryption keys for each service on the local -host. Any host offering network services would have a key here, although -many such files can be used. - -The principal.* files comprise the KerberosIV database itself, and contain -keys for all principles, and should not be world-readable. - -The krb.conf file contains the configuration for this machine: -1) which realm I'm in - if this line begins with '#', KerberosIV is disabled system-wide. -2) which servers I should talk to for _this_ realm -3) which servers I should talk to for the following realms. - -The krb.realms file contains the name of KerberosIV servers for -various (sub)domains. - -KerberosIV log information it placed in /var/log/kerberos.log -(see /etc/rc to change it) diff --git a/etc/kerberosIV/krb.conf b/etc/kerberosIV/krb.conf deleted file mode 100644 index 1d5ffca4292..00000000000 --- a/etc/kerberosIV/krb.conf +++ /dev/null @@ -1,5 +0,0 @@ -#MY.DOMAIN -#MY.DOMAIN me.my.domain admin server -SIGMASOFT.COM gandalf.sigmasoft.com admin server -TOAD.COM toad.com admin server -TETHERLESS.COM gandalf.pa.tetherless.com admin server diff --git a/etc/kerberosIV/krb.equiv b/etc/kerberosIV/krb.equiv deleted file mode 100644 index f710770902b..00000000000 --- a/etc/kerberosIV/krb.equiv +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenBSD: krb.equiv,v 1.4 2002/06/09 06:15:15 todd Exp $ -# krb.equiv contains a list of IP addresses that is to be considered being -# the same host for KerberosIV purposes. -# Please refer to krb.equiv(5) for more information. -# -# Examples -# A machine with two interfaces. -#130.237.232.113 130.237.221.42 # emma emma-ether -# A machine with *many* interfaces -#193.10.156.0/24 193.10.157.0/24 # syk-* syk-*-hps diff --git a/etc/kerberosIV/krb.extra b/etc/kerberosIV/krb.extra deleted file mode 100644 index d61b6826c1f..00000000000 --- a/etc/kerberosIV/krb.extra +++ /dev/null @@ -1,25 +0,0 @@ -# $OpenBSD: krb.extra,v 1.3 2003/01/06 11:33:25 miod Exp $ -# -# This file holds some configuration options that are not normally used. -# Please see krb.extra(5) for more information about this file - only -# the most commonly used variables are listed here. -# -# You can specify a number of VARIABLE = VALUE pairs in this file. Empty lines -# and lines beginning with a hash (#) are ignored. - -# kdc_timeout specifies how many seconds to wait for a respons from the KDC. -# Default is 4 seconds. -#kdc_timeout=4 - -# kdc_timesync makes KerberosIV store the time difference between the client -# and the KDC. This makes it possible to use KerberosIV if for some reason you -# cannot synchronize the clocks. Default is no. -#kdc_timesync=yes - -# To get KerberosIV tickets via a http proxy, use krb4_proxy to specify what -# proxy to user. Default is to not use a proxy. -#krb4_proxy=proxy - -# If your network uses NAT (Network Address Translation), this enables some -# code that will make your life easier. Default is no. -#nat_in_use=yes diff --git a/etc/kerberosIV/krb.realms b/etc/kerberosIV/krb.realms deleted file mode 100644 index 766ea70e2f3..00000000000 --- a/etc/kerberosIV/krb.realms +++ /dev/null @@ -1,13 +0,0 @@ -my.domain MY.DOMAIN -.my.domain MY.DOMAIN -sigmasoft.com SIGMASOFT.COM -.sigmasoft.com SIGMASOFT.COM -toad.com TOAD.COM -.toad.com TOAD.COM -tetherless.com TETHERLESS.COM -.tetherless.com TETHERLESS.COM -.pa.tetherless.com TETHERLESS.COM -tetherless.net TETHERLESS.COM -.tetherless.net TETHERLESS.COM -.pa.tetherless.net TETHERLESS.COM -.ba.tetherless.net TETHERLESS.COM diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index fd3defb1e1f..e5491c8514b 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.153 2003/05/17 05:27:43 mho Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.154 2003/06/27 21:26:20 david Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -74,11 +74,6 @@ private uname=root mode=0700 # ./etc/isakmpd .. -# ./etc/kerberosIV -kerberosIV -# ./etc/kerberosIV -.. - # ./etc/kerberosV kerberosV # ./etc/kerberosV diff --git a/etc/mtree/4.4BSD.root b/etc/mtree/4.4BSD.root index 67293717dd1..4c4c6d35235 100644 --- a/etc/mtree/4.4BSD.root +++ b/etc/mtree/4.4BSD.root @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.root,v 1.9 2002/06/09 06:15:15 todd Exp $ +# $OpenBSD: 4.4BSD.root,v 1.10 2003/06/27 21:26:20 david Exp $ # $NetBSD: 4.4BSD.root,v 1.2 1996/05/12 23:30:32 thorpej Exp $ # # user: bostic @@ -76,13 +76,6 @@ disklabels type=dir mode=0775 .. -# ./etc/kerberosIV -/set type=file gname=wheel uname=root mode=0444 -kerberosIV type=dir mode=0755 -# ./etc/kerberosIV -.. - - # ./etc/mtree /set type=file gname=wheel uname=root mode=0600 mtree type=dir mode=0755 diff --git a/etc/mtree/4.4BSD.usr b/etc/mtree/4.4BSD.usr index 30ba2f898b6..a46f578a75b 100644 --- a/etc/mtree/4.4BSD.usr +++ b/etc/mtree/4.4BSD.usr @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.usr,v 1.20 2003/03/17 07:38:13 deraadt Exp $ +# $OpenBSD: 4.4BSD.usr,v 1.21 2003/06/27 21:26:20 david Exp $ # $NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $ # # user: bostic @@ -274,13 +274,6 @@ std type=dir mode=0755 .. -# ./include/kerberosIV -/set type=file gname=bin uname=root mode=0444 -kerberosIV type=dir uname=root gname=wheel mode=0755 -# ./include/kerberosIV -.. - - # ./include/pascal /set type=file gname=bin uname=root mode=0444 pascal type=dir uname=root gname=wheel mode=0755 diff --git a/etc/mtree/special b/etc/mtree/special index cf75a2212a6..9f5aa413871 100644 --- a/etc/mtree/special +++ b/etc/mtree/special @@ -1,4 +1,4 @@ -# $OpenBSD: special,v 1.52 2003/03/30 14:58:18 jmc Exp $ +# $OpenBSD: special,v 1.53 2003/06/27 21:26:20 david Exp $ # $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # @@ -32,8 +32,6 @@ group type=file mode=0644 uname=root gname=wheel hosts type=file mode=0644 uname=root gname=wheel hosts.equiv type=file mode=0600 uname=root gname=wheel optional inetd.conf type=file mode=0644 uname=root gname=wheel -kerberosIV type=dir mode=0755 uname=root gname=wheel optional ignore -.. #kerberosIV kerberosV type=dir mode=0755 uname=root gname=wheel optional ignore .. #kerberosV host.random type=file mode=0600 uname=root gname=wheel optional diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index d162a9344bd..62e7822d139 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hier.7,v 1.40 2003/06/10 08:47:13 jmc Exp $ +.\" $OpenBSD: hier.7,v 1.41 2003/06/27 21:26:20 david Exp $ .\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -98,8 +98,6 @@ Backup disklabels (see .It isakmpd/ Configuration files for .Xr isakmpd 8 . -.It kerberosIV/ -Configuration files for the Kerberos version IV subsystem. .It kerberosV/ Configuration files for the Kerberos version V subsystem (see .Xr info 1 |