OpenBSD specific changes to kth-krb.

kafs.h has been replaced with the one correctly hacked by art@ to
build with arla.

6 files changed, 23 insertions, 110 deletions

diff --git a/kerberosIV/src/kadmin/kadm_server.h b/kerberosIV/src/kadmin/kadm_server.h
index ec67e201647..7e7c3a59791 100644
--- a/kerberosIV/src/kadmin/kadm_server.h
+++ b/kerberosIV/src/kadmin/kadm_server.h
@@ -56,7 +56,7 @@ typedef struct {
 #endif /* KADM_SYSLOG */
 
 #ifndef DEFAULT_ACL_DIR
-#define DEFAULT_ACL_DIR	"/var/kerberos"
+#define DEFAULT_ACL_DIR	"/etc/kerberosIV"
 #endif /* DEFAULT_ACL_DIR */
 #define	ADD_ACL_FILE	"/admin_acl.add"
 #define	GET_ACL_FILE	"/admin_acl.get"
diff --git a/kerberosIV/src/lib/kadm/kadm.h b/kerberosIV/src/lib/kadm/kadm.h
index 250011c33c2..1354f12eda2 100644
--- a/kerberosIV/src/lib/kadm/kadm.h
+++ b/kerberosIV/src/lib/kadm/kadm.h
@@ -18,7 +18,7 @@
  * Doug Church, December 28, 1989, MIT Project Athena
  */
 
-#include <krb_db.h>
+#include <kerberosIV/krb_db.h>
 
 /* The global structures for the client and server */
 typedef struct {
diff --git a/kerberosIV/src/lib/kafs/kafs.h b/kerberosIV/src/lib/kafs/kafs.h
index 0d86871c106..fb6422dd714 100644
--- a/kerberosIV/src/lib/kafs/kafs.h
+++ b/kerberosIV/src/lib/kafs/kafs.h
@@ -1,5 +1,8 @@
+/*	$OpenBSD: kafs.h,v 1.2 2000/02/25 16:12:38 hin Exp $	*/
+/*	$KTH: kafs.h,v 1.28 1998/04/26 18:20:09 joda Exp $	*/
+
 /*
- * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -14,7 +17,12 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 
- * 3. Neither the name of the Institute nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the Kungliga Tekniska
+ *      Högskolan and its contributors.
+ * 
+ * 4. Neither the name of the Institute nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 
@@ -31,8 +39,6 @@
  * SUCH DAMAGE.
  */
 
-/* $KTH: kafs.h,v 1.32 1999/12/02 16:58:40 joda Exp $ */
-
 #ifndef __KAFS_H
 #define __KAFS_H
 
@@ -40,72 +46,7 @@
 
 /* sys/ioctl.h must be included manually before kafs.h */
 
-/*
- */
-#define AFSCALL_PIOCTL 20
-#define AFSCALL_SETPAG 21
-
-#ifndef _VICEIOCTL
-#define _VICEIOCTL(id)  ((unsigned int ) _IOW('V', id, struct ViceIoctl))
-#endif /* _VICEIOCTL */
-
-#define VIOCSETAL		_VICEIOCTL(1)
-#define VIOCGETAL		_VICEIOCTL(2)
-#define VIOCSETTOK		_VICEIOCTL(3)
-#define VIOCGETVOLSTAT		_VICEIOCTL(4)
-#define VIOCSETVOLSTAT		_VICEIOCTL(5)
-#define VIOCFLUSH		_VICEIOCTL(6)
-#define VIOCGETTOK		_VICEIOCTL(8)
-#define VIOCUNLOG		_VICEIOCTL(9)
-#define VIOCCKSERV		_VICEIOCTL(10)
-#define VIOCCKBACK		_VICEIOCTL(11)
-#define VIOCCKCONN		_VICEIOCTL(12)
-#define VIOCWHEREIS		_VICEIOCTL(14)
-#define VIOCACCESS		_VICEIOCTL(20)
-#define VIOCUNPAG		_VICEIOCTL(21)
-#define VIOCGETFID		_VICEIOCTL(22)
-#define VIOCSETCACHESIZE	_VICEIOCTL(24)
-#define VIOCFLUSHCB		_VICEIOCTL(25)
-#define VIOCNEWCELL		_VICEIOCTL(26)
-#define VIOCGETCELL		_VICEIOCTL(27)
-#define VIOC_AFS_DELETE_MT_PT	_VICEIOCTL(28)
-#define VIOC_AFS_STAT_MT_PT	_VICEIOCTL(29)
-#define VIOC_FILE_CELL_NAME	_VICEIOCTL(30)
-#define VIOC_GET_WS_CELL	_VICEIOCTL(31)
-#define VIOC_AFS_MARINER_HOST	_VICEIOCTL(32)
-#define VIOC_GET_PRIMARY_CELL	_VICEIOCTL(33)
-#define VIOC_VENUSLOG		_VICEIOCTL(34)
-#define VIOC_GETCELLSTATUS	_VICEIOCTL(35)
-#define VIOC_SETCELLSTATUS	_VICEIOCTL(36)
-#define VIOC_FLUSHVOLUME	_VICEIOCTL(37)
-#define VIOC_AFS_SYSNAME	_VICEIOCTL(38)
-#define VIOC_EXPORTAFS		_VICEIOCTL(39)
-#define VIOCGETCACHEPARAMS	_VICEIOCTL(40)
-#define VIOC_GCPAGS		_VICEIOCTL(48) 
-
-struct ViceIoctl {
-  caddr_t in, out;
-  short in_size;
-  short out_size;
-};
-
-struct ClearToken {
-  int32_t AuthHandle;
-  char HandShakeKey[8];
-  int32_t ViceId;
-  int32_t BeginTimestamp;
-  int32_t EndTimestamp;
-};
-
-#ifdef __STDC__
-#ifndef __P
-#define __P(x) x
-#endif
-#else
-#ifndef __P
-#define __P(x) ()
-#endif
-#endif
+#include <xfs/xfs_pioctl.h>
 
 /* Use k_hasafs() to probe if the machine supports AFS syscalls.
    The other functions will generate a SIGSYS if AFS is not supported */
@@ -114,13 +55,6 @@ int k_hasafs __P((void));
 
 int krb_afslog __P((const char *cell, const char *realm));
 int krb_afslog_uid __P((const char *cell, const char *realm, uid_t uid));
-int krb_afslog_home __P((const char *cell, const char *realm,
-			 const char *homedir));
-int krb_afslog_uid_home __P((const char *cell, const char *realm, uid_t uid,
-			     const char *homedir));
-
-int krb_realm_of_cell __P((const char *cell, char **realm));
-
 /* compat */
 #define k_afsklog krb_afslog
 #define k_afsklog_uid krb_afslog_uid
@@ -133,8 +67,6 @@ int k_unlog __P((void));
 int k_setpag __P((void));
 int k_afs_cell_of_file __P((const char *path, char *cell, int len));
 
-
-
 /* XXX */
 #ifdef KFAILURE
 #define KRB_H_INCLUDED
@@ -149,30 +81,10 @@ int kafs_settoken __P((const char*, uid_t, CREDENTIALS*));
 #endif
 
 #ifdef KRB5_H_INCLUDED
-krb5_error_code krb5_afslog_uid __P((krb5_context context,
-				     krb5_ccache id,
-				     const char *cell,
-				     krb5_const_realm realm,
-				     uid_t uid));
-krb5_error_code krb5_afslog __P((krb5_context context,
-				 krb5_ccache id, 
-				 const char *cell,
-				 krb5_const_realm realm));
-krb5_error_code krb5_afslog_uid_home __P((krb5_context context,
-					  krb5_ccache id,
-					  const char *cell,
-					  krb5_const_realm realm,
-					  uid_t uid,
-					  const char *homedir));
-
-krb5_error_code krb5_afslog_home __P((krb5_context context,
-				      krb5_ccache id,
-				      const char *cell,
-				      krb5_const_realm realm,
-				      const char *homedir));
-
-krb5_error_code krb5_realm_of_cell __P((const char *cell, char **realm));
-
+krb5_error_code krb5_afslog_uid __P((krb5_context, krb5_ccache,
+				     const char*, krb5_const_realm, uid_t));
+krb5_error_code krb5_afslog __P((krb5_context, krb5_ccache, 
+				 const char*, krb5_const_realm));
 #endif
 
 
@@ -181,7 +93,7 @@ krb5_error_code krb5_realm_of_cell __P((const char *cell, char **realm));
 #define _PATH_CELLSERVDB 	_PATH_VICE "CellServDB"
 #define _PATH_THESECELLS	_PATH_VICE "TheseCells"
 
-#define _PATH_ARLA_VICE		"/usr/arla/etc/"
+#define _PATH_ARLA_VICE		"/etc/afs/"
 #define _PATH_ARLA_THISCELL	_PATH_ARLA_VICE "ThisCell"
 #define _PATH_ARLA_CELLSERVDB 	_PATH_ARLA_VICE "CellServDB"
 #define _PATH_ARLA_THESECELLS	_PATH_ARLA_VICE "TheseCells"
diff --git a/kerberosIV/src/lib/krb/defaults.c b/kerberosIV/src/lib/krb/defaults.c
index cf53a29f5e5..cc089aa7b50 100644
--- a/kerberosIV/src/lib/krb/defaults.c
+++ b/kerberosIV/src/lib/krb/defaults.c
@@ -54,5 +54,5 @@ krb_get_default_keyfile(void)
   if (t)
     return t;
   else
-    return "/etc/srvtab";
+    return "/etc/kerberosIV/srvtab";
 }
diff --git a/kerberosIV/src/lib/krb/krb.h b/kerberosIV/src/lib/krb/krb.h
index 5db4f521ae4..ca7a0c3dd8f 100644
--- a/kerberosIV/src/lib/krb/krb.h
+++ b/kerberosIV/src/lib/krb/krb.h
@@ -14,7 +14,8 @@
 #define signed
 #endif
 
-#include <ktypes.h>
+#include <sys/types.h>
+#include <inttypes.h>
 #include <time.h>
 
 #ifndef __KRB_H__
@@ -104,7 +105,7 @@ extern const char *krb_err_txt[MAX_KRB_ERRORS];
 #define KRB_RLM_FILES	{ KRB_RLM_TRANS, "/etc/kerberosIV/krb.realms", 0}
 #endif
 #ifndef KRB_EQUIV
-#define KRB_EQUIV	"/etc/krb.equiv"
+#define KRB_EQUIV	"/etc/kerberosIV/krb.equiv"
 #endif
 #define KRB_MASTER	"kerberos"
 #ifndef KRB_REALM
diff --git a/kerberosIV/src/slave/kprop.h b/kerberosIV/src/slave/kprop.h
index 9ed8d3da91f..4c48854db77 100644
--- a/kerberosIV/src/slave/kprop.h
+++ b/kerberosIV/src/slave/kprop.h
@@ -9,7 +9,7 @@
  */
 
 #define KPROP_SERVICE_NAME "rcmd"
-#define KPROP_SRVTAB "/etc/srvtab"
+#define KPROP_SRVTAB "/etc/kerberosIV/srvtab"
 #define KPROP_PROT_VERSION_LEN 8
 #define KPROP_PROT_VERSION "kprop01"
 #define KPROP_TRANSFER_PRIVATE 1