summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kerberosIV/acl/acl_check.36
-rw-r--r--kerberosIV/des/des_crypt.35
-rw-r--r--kerberosIV/ext_srvtab/ext_srvtab.86
-rw-r--r--kerberosIV/include/kadm_locl.h6
-rw-r--r--kerberosIV/kadmin/kadmin.82
-rw-r--r--kerberosIV/kadmind/kadmind.810
-rw-r--r--kerberosIV/kdb_destroy/kdb_destroy.86
-rw-r--r--kerberosIV/kdb_edit/kdb_edit.86
-rw-r--r--kerberosIV/kdb_init/kdb_init.810
-rw-r--r--kerberosIV/kdb_util/kdb_util.84
-rw-r--r--kerberosIV/kdestroy/kdestroy.12
-rw-r--r--kerberosIV/kerberos/kerberos.82
-rw-r--r--kerberosIV/kinit/kinit.12
-rw-r--r--kerberosIV/klist/klist.12
-rw-r--r--kerberosIV/kpasswdd/kpasswdd.82
-rw-r--r--kerberosIV/krb/kerberos.315
-rw-r--r--kerberosIV/krb/krb_realmofhost.310
-rw-r--r--kerberosIV/krb/krb_sendauth.310
-rw-r--r--kerberosIV/krb/krb_set_tkt_string.36
-rw-r--r--kerberosIV/krb/kuserok.310
-rw-r--r--kerberosIV/krb/tf_util.36
-rw-r--r--kerberosIV/ksrvtgt/ksrvtgt.12
-rw-r--r--kerberosIV/ksrvutil/ksrvutil.82
-rw-r--r--kerberosIV/kstash/kstash.86
-rw-r--r--kerberosIV/make_keypair/make_keypair.82
-rw-r--r--kerberosIV/man/kerberos.12
-rw-r--r--kerberosIV/man/krb.conf.52
-rw-r--r--kerberosIV/man/krb.realms.52
-rw-r--r--kerberosIV/register/register.12
-rw-r--r--kerberosIV/registerd/registerd.82
30 files changed, 69 insertions, 81 deletions
diff --git a/kerberosIV/acl/acl_check.3 b/kerberosIV/acl/acl_check.3
index c1e57741cfc..d2657737dd6 100644
--- a/kerberosIV/acl/acl_check.3
+++ b/kerberosIV/acl/acl_check.3
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: acl_check.3,v 1.1 1995/12/14 06:52:36 tholo Exp $
+.\" $OpenBSD: acl_check.3,v 1.2 1997/05/30 03:11:15 gene Exp $
.TH ACL_CHECK 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
acl_canonicalize_principal, acl_check, acl_exact_match, acl_add,
@@ -15,7 +15,7 @@ acl_delete, acl_initialize \- Access control list routines
cc <files> \-lacl \-lkrb
.PP
.ft B
-#include <krb.h>
+#include <kerberosIV/kerberosIV/krb.h>
.PP
.ft B
acl_canonicalize_principal(principal, buf)
@@ -97,7 +97,7 @@ must contain enough
space to store a principal, given the limits on the sizes of name,
instance, and realm specified as ANAME_SZ, INST_SZ, and REALM_SZ,
respectively, in
-.IR /usr/include/krb.h .
+.IR /usr/include/kerberosIV/kerberosIV/krb.h .
.PP
.I acl_check
returns nonzero if
diff --git a/kerberosIV/des/des_crypt.3 b/kerberosIV/des/des_crypt.3
index 6041352c9d4..eb859ce91b5 100644
--- a/kerberosIV/des/des_crypt.3
+++ b/kerberosIV/des/des_crypt.3
@@ -1,3 +1,4 @@
+.\" $OpenBSD: des_crypt.3,v 1.4 1997/05/30 03:11:16 gene Exp $
.TH DES_CRYPT 3
.SH NAME
des_read_password, des_read_2password,
@@ -13,7 +14,7 @@ des_is_weak_key, crypt \- (non USA) DES encryption
.nf
.nj
.ft B
-#include <des.h>
+#include <kerberosIV/des.h>
.PP
.B int des_read_password(key,prompt,verify)
des_cblock *key;
@@ -461,7 +462,7 @@ is a replacement for the normal system crypt.
It is much faster than the system crypt.
.PP
.SH FILES
-/usr/include/des.h
+/usr/include/kerberosIV/des.h
.br
/usr/lib/libdes.a
.PP
diff --git a/kerberosIV/ext_srvtab/ext_srvtab.8 b/kerberosIV/ext_srvtab/ext_srvtab.8
index 4988046123d..6b254d16d32 100644
--- a/kerberosIV/ext_srvtab/ext_srvtab.8
+++ b/kerberosIV/ext_srvtab/ext_srvtab.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: ext_srvtab.8,v 1.1 1995/12/14 06:52:41 tholo Exp $
+.\" $OpenBSD: ext_srvtab.8,v 1.2 1997/05/30 03:11:17 gene Exp $
.TH EXT_SRVTAB 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
ext_srvtab \- extract service key files from Kerberos key distribution center database
@@ -53,10 +53,10 @@ The master key string entered was incorrect.
Service key file generated for
.I hostname
.TP
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.TP
-/.k
+/etc/kerberosIV/master_key
Master key cache file.
.SH SEE ALSO
read_service_key(3), krb_get_phost(3)
diff --git a/kerberosIV/include/kadm_locl.h b/kerberosIV/include/kadm_locl.h
index 33e334abfb8..5c60644d734 100644
--- a/kerberosIV/include/kadm_locl.h
+++ b/kerberosIV/include/kadm_locl.h
@@ -1,4 +1,4 @@
-/* $Id: kadm_locl.h,v 1.1 1995/12/14 06:52:34 tholo Exp $ */
+/* $Id: kadm_locl.h,v 1.2 1997/05/30 03:11:18 gene Exp $ */
/*-
* Copyright 1987, 1988 by the Student Information Processing Board
@@ -50,10 +50,10 @@
#include <kerberosIV/des.h>
#include <kerberosIV/krb.h>
-#include "krb_err.h"
+#include <kerberosIV/krb_err.h>
#include <kerberosIV/krb_db.h>
#include <kerberosIV/kadm.h>
-#include "kadm_err.h"
+#include <kerberosIV/kadm_err.h>
#include "kerberosIV/acl.h"
#include "kadm_server.h"
diff --git a/kerberosIV/kadmin/kadmin.8 b/kerberosIV/kadmin/kadmin.8
index 0a84a5cb310..7fcbe7f4937 100644
--- a/kerberosIV/kadmin/kadmin.8
+++ b/kerberosIV/kadmin/kadmin.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kadmin.8,v 1.1 1995/12/14 06:52:48 tholo Exp $
+.\" $OpenBSD: kadmin.8,v 1.2 1997/05/30 03:11:19 gene Exp $
.TH KADMIN 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kadmin \- network utility for Kerberos database administration
diff --git a/kerberosIV/kadmind/kadmind.8 b/kerberosIV/kadmind/kadmind.8
index fbb6e4944e6..a694a88a57e 100644
--- a/kerberosIV/kadmind/kadmind.8
+++ b/kerberosIV/kadmind/kadmind.8
@@ -13,7 +13,7 @@
.\" the suitability of this software for any purpose. It is
.\" provided "as is" without express or implied warranty.
.\"
-.\" $Id: kadmind.8,v 1.1 1995/12/14 06:52:49 tholo Exp $
+.\" $OpenBSD: kadmind.8,v 1.2 1997/05/30 03:11:20 gene Exp $
.TH KADMIND 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kadmind \- Kerberos database administration daemon
@@ -104,19 +104,19 @@ in the database.
A principal is always granted authorization to change its own password.
.SH FILES
.TP 20n
-/kerberos/admin_server.syslog
+/var/log/admin_server.log
Default log file.
.TP
-/kerberos
+/etc/kerberosIV
Default access control list directory.
.TP
admin_acl.{add,get,mod}
Access control list files (within the directory)
.TP
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
Default DBM files containing database
.TP
-/.k
+/etc/kerberosIV/master_key
Master key cache file.
.SH "SEE ALSO"
kerberos(1), kpasswd(1), kadmin(8), acl_check(3)
diff --git a/kerberosIV/kdb_destroy/kdb_destroy.8 b/kerberosIV/kdb_destroy/kdb_destroy.8
index ddfc9d3d49a..a66c514381f 100644
--- a/kerberosIV/kdb_destroy/kdb_destroy.8
+++ b/kerberosIV/kdb_destroy/kdb_destroy.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kdb_destroy.8,v 1.1 1995/12/14 06:52:43 tholo Exp $
+.\" $OpenBSD: kdb_destroy.8,v 1.2 1997/05/30 03:11:20 gene Exp $
.TH KDB_DESTROY 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kdb_destroy \- destroy Kerberos key distribution center database
@@ -18,7 +18,7 @@ response beginning with `y' or `Y' confirms deletion.
Any other response aborts deletion.
.SH DIAGNOSTICS
.TP 20n
-"Database cannot be deleted at /kerberos/principal"
+"Database cannot be deleted at /etc/kerberosIV/principal"
The attempt to delete the database failed (probably due to a system or
access permission error).
.TP
@@ -26,7 +26,7 @@ access permission error).
The user aborted the deletion.
.SH FILES
.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.SH SEE ALSO
kdb_init(8)
diff --git a/kerberosIV/kdb_edit/kdb_edit.8 b/kerberosIV/kdb_edit/kdb_edit.8
index af09373e037..a7a364cdf4d 100644
--- a/kerberosIV/kdb_edit/kdb_edit.8
+++ b/kerberosIV/kdb_edit/kdb_edit.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kdb_edit.8,v 1.1 1995/12/14 06:52:42 tholo Exp $
+.\" $OpenBSD: kdb_edit.8,v 1.2 1997/05/30 03:11:21 gene Exp $
.TH KDB_EDIT 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kdb_edit \- Kerberos key distribution center database editing utility
@@ -47,8 +47,8 @@ printed.
The master key string entered was incorrect.
.SH FILES
.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.TP
-/.k
+/etc/kerberosIV/master_key
Master key cache file.
diff --git a/kerberosIV/kdb_init/kdb_init.8 b/kerberosIV/kdb_init/kdb_init.8
index c2ef5883a8a..b6e5a8da27e 100644
--- a/kerberosIV/kdb_init/kdb_init.8
+++ b/kerberosIV/kdb_init/kdb_init.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kdb_init.8,v 1.1 1995/12/14 06:52:42 tholo Exp $
+.\" $OpenBSD: kdb_init.8,v 1.2 1997/05/30 03:11:22 gene Exp $
.TH KDB_INIT 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kdb_init \- Initialize Kerberos key distribution center database
@@ -20,21 +20,21 @@ If the optional
.I realm
argument is not present,
.I kdb_init
-prompts for a realm name (defaulting to the definition in /usr/include/krb.h).
+prompts for a realm name (defaulting to the definition in /usr/include/kerberosIV/krb.h).
After determining the realm to be created, it prompts for
a master key password. The master key password is used to encrypt
every encryption key stored in the database.
.SH DIAGNOSTICS
.TP 20n
-"/kerberos/principal: File exists"
+"/etc/kerberosIV/principal: File exists"
An attempt was made to create a database on a machine which already had
an existing database.
.SH FILES
.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.TP
-/usr/include/krb.h
+/usr/include/kerberosIV/krb.h
Include file defining default realm
.SH SEE ALSO
kdb_destroy(8)
diff --git a/kerberosIV/kdb_util/kdb_util.8 b/kerberosIV/kdb_util/kdb_util.8
index c1c704230a9..e03ca764a80 100644
--- a/kerberosIV/kdb_util/kdb_util.8
+++ b/kerberosIV/kdb_util/kdb_util.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kdb_util.8,v 1.1 1995/12/14 06:52:42 tholo Exp $
+.\" $OpenBSD: kdb_util.8,v 1.2 1997/05/30 03:11:23 gene Exp $
.TH KDB_UTIL 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kdb_util \- Kerberos key distribution center database utility
@@ -55,7 +55,7 @@ is encrypted using the new format (encrypted directly with master key).
The master key string entered was incorrect.
.SH FILES
.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.TP
.IR filename .ok
diff --git a/kerberosIV/kdestroy/kdestroy.1 b/kerberosIV/kdestroy/kdestroy.1
index 412683f70fe..bd0f014737c 100644
--- a/kerberosIV/kdestroy/kdestroy.1
+++ b/kerberosIV/kdestroy/kdestroy.1
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kdestroy.1,v 1.1 1995/12/14 06:52:50 tholo Exp $
+.\" $OpenBSD: kdestroy.1,v 1.2 1997/05/30 03:11:24 gene Exp $
.TH KDESTROY 1 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kdestroy \- destroy Kerberos tickets
diff --git a/kerberosIV/kerberos/kerberos.8 b/kerberosIV/kerberos/kerberos.8
index 87004122a14..08e17a54741 100644
--- a/kerberosIV/kerberos/kerberos.8
+++ b/kerberosIV/kerberos/kerberos.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kerberos.8,v 1.1 1995/12/14 06:52:52 tholo Exp $
+.\" $OpenBSD: kerberos.8,v 1.2 1997/05/30 03:11:24 gene Exp $
.TH KERBEROS 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kerberos \- introduction to the Kerberos system
diff --git a/kerberosIV/kinit/kinit.1 b/kerberosIV/kinit/kinit.1
index 4df86817b04..66599a76623 100644
--- a/kerberosIV/kinit/kinit.1
+++ b/kerberosIV/kinit/kinit.1
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kinit.1,v 1.1 1995/12/14 06:52:52 tholo Exp $
+.\" $OpenBSD: kinit.1,v 1.2 1997/05/30 03:11:25 gene Exp $
.TH KINIT 1 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kinit \- Kerberos login utility
diff --git a/kerberosIV/klist/klist.1 b/kerberosIV/klist/klist.1
index 9f2f645715c..5c6c997b67a 100644
--- a/kerberosIV/klist/klist.1
+++ b/kerberosIV/klist/klist.1
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: klist.1,v 1.1 1995/12/14 06:52:50 tholo Exp $
+.\" $OpenBSD: klist.1,v 1.2 1997/05/30 03:11:26 gene Exp $
.TH KLIST 1 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
klist \- list currently held Kerberos tickets
diff --git a/kerberosIV/kpasswdd/kpasswdd.8 b/kerberosIV/kpasswdd/kpasswdd.8
index 33855a23a07..c4a225308d9 100644
--- a/kerberosIV/kpasswdd/kpasswdd.8
+++ b/kerberosIV/kpasswdd/kpasswdd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from @(#)kpasswdd.8 8.1 (Berkeley) 6/9/93
-.\" $Id: kpasswdd.8,v 1.1 1995/12/14 06:52:53 tholo Exp $
+.\" $OpenBSD: kpasswdd.8,v 1.2 1997/05/30 03:11:27 gene Exp $
.\"
.Dd June 9, 1993
.Dt KPASSWDD 8
diff --git a/kerberosIV/krb/kerberos.3 b/kerberosIV/krb/kerberos.3
index 4434508dc59..44b2dc3946c 100644
--- a/kerberosIV/krb/kerberos.3
+++ b/kerberosIV/krb/kerberos.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/kerberos.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/kerberos.3,v 1.1 1995/12/14 06:52:41 tholo Exp $
.\" Copyright 1989 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: kerberos.3,v 1.2 1997/05/30 03:11:28 gene Exp $
.TH KERBEROS 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
krb_mk_req, krb_rd_req, krb_kntoln, krb_set_key, krb_get_cred,
@@ -15,8 +13,8 @@ krb_rd_err, krb_ck_repl \- Kerberos authentication library
.nf
.nj
.ft B
-#include <des.h>
-#include <krb.h>
+#include <kerberosIV/des.h>
+#include <kerberosIV/krb.h>
.PP
.ft B
extern char *krb_err_txt[];
@@ -432,22 +430,21 @@ is passed. The structure is
filled in with data obtained from Kerberos.
.PP
.SH FILES
-/usr/include/krb.h
+/usr/include/kerberosIV/krb.h
.br
/usr/lib/libkrb.a
.br
-/usr/include/des.h
+/usr/include/kerberosIV/des.h
.br
/usr/lib/libdes.a
.br
/etc/aname
.br
-/etc/srvtab
+/etc/kerberosIV/srvtab
.br
/tmp/tkt[uid]
.SH "SEE ALSO"
kerberos(1), des_crypt(3)
-.SH DIAGNOSTICS
.SH BUGS
The caller of
.I krb_rd_req, krb_rd_priv, and krb_rd_safe
diff --git a/kerberosIV/krb/krb_realmofhost.3 b/kerberosIV/krb/krb_realmofhost.3
index 843cf868b7c..46dfa37d80a 100644
--- a/kerberosIV/krb/krb_realmofhost.3
+++ b/kerberosIV/krb/krb_realmofhost.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_realmofhost.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_realmofhost.3,v 1.1 1995/12/14 06:52:41 tholo Exp $
.\" Copyright 1989 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: krb_realmofhost.3,v 1.2 1997/05/30 03:11:28 gene Exp $
.TH KRB_REALMOFHOST 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
krb_realmofhost, krb_get_phost, krb_get_krbhst, krb_get_admhst,
@@ -14,9 +12,9 @@ krb_get_lrealm \- additional Kerberos utility routines
.nf
.nj
.ft B
-#include <krb.h>
-#include <des.h>
-#include <netinet/in.h>
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
+#include <kerberosIV/netinet/in.h>
.PP
.ft B
char *krb_realmofhost(host)
diff --git a/kerberosIV/krb/krb_sendauth.3 b/kerberosIV/krb/krb_sendauth.3
index 6e0d0d7a577..25aa30fa958 100644
--- a/kerberosIV/krb/krb_sendauth.3
+++ b/kerberosIV/krb/krb_sendauth.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_sendauth.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_sendauth.3,v 1.1 1995/12/14 06:52:41 tholo Exp $
.\" Copyright 1988 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: krb_sendauth.3,v 1.2 1997/05/30 03:11:29 gene Exp $
.TH KRB_SENDAUTH 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
krb_sendauth, krb_recvauth, krb_net_write, krb_net_read \-
@@ -14,9 +12,9 @@ Kerberos routines for sending authentication via network stream sockets
.nf
.nj
.ft B
-#include <krb.h>
-#include <des.h>
-#include <netinet/in.h>
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
+#include <kerberosIV/netinet/in.h>
.PP
.fi
.HP 1i
diff --git a/kerberosIV/krb/krb_set_tkt_string.3 b/kerberosIV/krb/krb_set_tkt_string.3
index f29a55b307d..dac949629d7 100644
--- a/kerberosIV/krb/krb_set_tkt_string.3
+++ b/kerberosIV/krb/krb_set_tkt_string.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_set_tkt_string.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/krb_set_tkt_string.3,v 1.1 1995/12/14 06:52:40 tholo Exp $
.\" Copyright 1989 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: krb_set_tkt_string.3,v 1.2 1997/05/30 03:11:29 gene Exp $
.TH KRB_SET_TKT_STRING 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
krb_set_tkt_string \- set Kerberos ticket cache file name
@@ -13,7 +11,7 @@ krb_set_tkt_string \- set Kerberos ticket cache file name
.nf
.nj
.ft B
-#include <krb.h>
+#include <kerberosIV/krb.h>
.PP
.ft B
void krb_set_tkt_string(filename)
diff --git a/kerberosIV/krb/kuserok.3 b/kerberosIV/krb/kuserok.3
index 26da3e732fc..ec4573d4c80 100644
--- a/kerberosIV/krb/kuserok.3
+++ b/kerberosIV/krb/kuserok.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/kuserok.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/kuserok.3,v 1.1 1995/12/14 06:52:40 tholo Exp $
.\" Copyright 1989 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: kuserok.3,v 1.2 1997/05/30 03:11:30 gene Exp $
.TH KUSEROK 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kuserok \- Kerberos version of ruserok
@@ -13,7 +11,7 @@ kuserok \- Kerberos version of ruserok
.nf
.nj
.ft B
-#include <krb.h>
+#include <kerberosIV/krb.h>
.PP
.ft B
kuserok(kdata, localuser)
@@ -28,7 +26,7 @@ determines whether a Kerberos principal described by the structure
is authorized to login as user
.I localuser
according to the authorization file
-("~\fIlocaluser\fR/.klogin" by default). It returns 0 (zero) if authorized,
+("~\fIlocaluser\fR/etc/kerberosIV/master_keylogin" by default). It returns 0 (zero) if authorized,
1 (one) if not authorized.
.PP
If there is no account for
@@ -60,5 +58,5 @@ with one entry per line.
kerberos(3), ruserok(3), krb_kntoln(3)
.SH FILES
.TP 20n
-~\fIlocaluser\fR/.klogin
+~\fIlocaluser\fR/etc/kerberosIV/master_keylogin
authorization list
diff --git a/kerberosIV/krb/tf_util.3 b/kerberosIV/krb/tf_util.3
index 7b21c50cfad..6c2e12faa1d 100644
--- a/kerberosIV/krb/tf_util.3
+++ b/kerberosIV/krb/tf_util.3
@@ -1,11 +1,9 @@
-.\" $Source: /cvs/OpenBSD/src/kerberosIV/krb/Attic/tf_util.3,v $
-.\" $Author: tholo $
-.\" $Header: /cvs/OpenBSD/src/kerberosIV/krb/Attic/tf_util.3,v 1.1 1995/12/14 06:52:40 tholo Exp $
.\" Copyright 1989 by the Massachusetts Institute of Technology.
.\"
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
+.\" $OpenBSD: tf_util.3,v 1.2 1997/05/30 03:11:30 gene Exp $
.TH TF_UTIL 3 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
tf_init, tf_get_pname, tf_get_pinst, tf_get_cred, tf_close \
@@ -14,7 +12,7 @@ tf_init, tf_get_pname, tf_get_pinst, tf_get_cred, tf_close \
.nf
.nj
.ft B
-#include <krb.h>
+#include <kerberosIV/krb.h>
.PP
.ft B
extern char *krb_err_txt[];
diff --git a/kerberosIV/ksrvtgt/ksrvtgt.1 b/kerberosIV/ksrvtgt/ksrvtgt.1
index e6c117d7c53..790f7be8448 100644
--- a/kerberosIV/ksrvtgt/ksrvtgt.1
+++ b/kerberosIV/ksrvtgt/ksrvtgt.1
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: ksrvtgt.1,v 1.1 1995/12/14 06:52:51 tholo Exp $
+.\" $OpenBSD: ksrvtgt.1,v 1.2 1997/05/30 03:11:31 gene Exp $
.TH KSRVTGT 1 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
ksrvtgt \- fetch and store Kerberos ticket-granting-ticket using a
diff --git a/kerberosIV/ksrvutil/ksrvutil.8 b/kerberosIV/ksrvutil/ksrvutil.8
index e6b2181defb..9f3c9fbdd74 100644
--- a/kerberosIV/ksrvutil/ksrvutil.8
+++ b/kerberosIV/ksrvutil/ksrvutil.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: ksrvutil.8,v 1.2 1997/04/08 23:08:50 rees Exp $
+.\" $OpenBSD: ksrvutil.8,v 1.3 1997/05/30 03:11:32 gene Exp $
.TH KSRVUTIL 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
ksrvutil \- host kerberos keyfile (srvtab) manipulation utility
diff --git a/kerberosIV/kstash/kstash.8 b/kerberosIV/kstash/kstash.8
index f7a660dd0fd..1f0eba9a974 100644
--- a/kerberosIV/kstash/kstash.8
+++ b/kerberosIV/kstash/kstash.8
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kstash.8,v 1.1 1995/12/14 06:52:41 tholo Exp $
+.\" $OpenBSD: kstash.8,v 1.2 1997/05/30 03:11:33 gene Exp $
.TH KSTASH 8 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kstash \- stash Kerberos key distribution center database master key
@@ -33,8 +33,8 @@ system call returned an error while
was attempting to write the key to the file.
.SH FILES
.TP 20n
-/kerberos/principal.pag, /kerberos/principal.dir
+/etc/kerberosIV/principal.pag, /etc/kerberosIV/principal.dir
DBM files containing database
.TP
-/.k
+/etc/kerberosIV/master_key
Master key cache file.
diff --git a/kerberosIV/make_keypair/make_keypair.8 b/kerberosIV/make_keypair/make_keypair.8
index e5afe970891..add97099554 100644
--- a/kerberosIV/make_keypair/make_keypair.8
+++ b/kerberosIV/make_keypair/make_keypair.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from @(#)make_keypair.8 8.2 (Berkeley) 12/11/93
-.\" $Id: make_keypair.8,v 1.1 1995/12/14 06:52:53 tholo Exp $
+.\" $OpenBSD: make_keypair.8,v 1.2 1997/05/30 03:11:33 gene Exp $
.\"
.Dd December 11, 1993
.Dt MAKE_KEYPAIR 8
diff --git a/kerberosIV/man/kerberos.1 b/kerberosIV/man/kerberos.1
index 435cc11b252..182adc5c0a0 100644
--- a/kerberosIV/man/kerberos.1
+++ b/kerberosIV/man/kerberos.1
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: kerberos.1,v 1.1 1995/12/14 06:52:35 tholo Exp $
+.\" $OpenBSD: kerberos.1,v 1.2 1997/05/30 03:11:34 gene Exp $
.TH KERBEROS 1 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
kerberos \- introduction to the Kerberos system
diff --git a/kerberosIV/man/krb.conf.5 b/kerberosIV/man/krb.conf.5
index 7320367b2fc..8331dbaf363 100644
--- a/kerberosIV/man/krb.conf.5
+++ b/kerberosIV/man/krb.conf.5
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: krb.conf.5,v 1.1 1995/12/14 06:52:35 tholo Exp $
+.\" $OpenBSD: krb.conf.5,v 1.2 1997/05/30 03:11:35 gene Exp $
.TH KRB.CONF 5 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
/etc/kerberosIV/krb.conf \- Kerberos configuration file
diff --git a/kerberosIV/man/krb.realms.5 b/kerberosIV/man/krb.realms.5
index 9a523be169c..521e1f410b7 100644
--- a/kerberosIV/man/krb.realms.5
+++ b/kerberosIV/man/krb.realms.5
@@ -3,7 +3,7 @@
.\" For copying and distribution information,
.\" please see the file <mit-copyright.h>.
.\"
-.\" $Id: krb.realms.5,v 1.1 1995/12/14 06:52:35 tholo Exp $
+.\" $OpenBSD: krb.realms.5,v 1.2 1997/05/30 03:11:35 gene Exp $
.TH KRB.REALMS 5 "Kerberos Version 4.0" "MIT Project Athena"
.SH NAME
/etc/kerberosIV/krb.realms \- host to Kerberos realm translation file
diff --git a/kerberosIV/register/register.1 b/kerberosIV/register/register.1
index c31b8dd6880..f3ff77467d8 100644
--- a/kerberosIV/register/register.1
+++ b/kerberosIV/register/register.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from @(#)register.1 8.1 (Berkeley) 6/1/93
-.\" $Id: register.1,v 1.1 1995/12/14 06:52:33 tholo Exp $
+.\" $OpenBSD: register.1,v 1.2 1997/05/30 03:11:36 gene Exp $
.\"
.TH REGISTER 1 "June 1, 1993"
.UC 7
diff --git a/kerberosIV/registerd/registerd.8 b/kerberosIV/registerd/registerd.8
index 002f690d85e..87713e3f286 100644
--- a/kerberosIV/registerd/registerd.8
+++ b/kerberosIV/registerd/registerd.8
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from @(#)registerd.8 8.2 (Berkeley) 12/11/93
-.\" $Id: registerd.8,v 1.1 1995/12/14 06:52:36 tholo Exp $
+.\" $OpenBSD: registerd.8,v 1.2 1997/05/30 03:11:37 gene Exp $
.\"
.Dd December 11, 1993
.Dt REGISTERD 8