3 files changed, 28 insertions, 16 deletions
diff --git a/kerberosIV/include/kerberosIV/kadm.h b/kerberosIV/include/kerberosIV/kadm.h
index 984f9f2ee8c..f56306bfd62 100644
--- a/kerberosIV/include/kerberosIV/kadm.h
+++ b/kerberosIV/include/kerberosIV/kadm.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: kadm.h,v 1.4 1998/02/25 15:50:40 art Exp $	*/
-/* $KTH: kadm.h,v 1.13 1997/08/17 07:30:24 assar Exp $ */
+/*	$OpenBSD: kadm.h,v 1.5 1998/05/18 02:12:46 art Exp $	*/
+/* $KTH: kadm.h,v 1.15 1998/04/23 22:17:52 joda Exp $ */
 
 /*
  * This source code is no longer held under any constraint of USA
@@ -101,9 +101,6 @@ typedef struct {
     u_int8_t  max_life;
 } Kadm_vals;                    /* The basic values structure in Kadm */
 
-/* Kadm_vals structure for passing db fields into the server routines */
-#define FLDSZ        4
-
 /* Need to define fields types here */
 #define KADM_NAME       31
 #define KADM_INST       30
@@ -162,7 +159,6 @@ int kadm_add __P((Kadm_vals *));
 int kadm_del __P((Kadm_vals *));
 void kadm_vals_to_prin __P((u_char *, Principal *, Kadm_vals *));
 void kadm_prin_to_vals __P((u_char *, Kadm_vals *, Principal *));
-
-
+int kadm_check_pw __P((const char*));
 
 #endif /* KADM_DEFS */
diff --git a/kerberosIV/include/kerberosIV/krb-protos.h b/kerberosIV/include/kerberosIV/krb-protos.h
index a6d5a9563c8..3dc6a781f93 100644
--- a/kerberosIV/include/kerberosIV/krb-protos.h
+++ b/kerberosIV/include/kerberosIV/krb-protos.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: krb-protos.h,v 1.2 1998/02/18 11:53:42 art Exp $	*/
-/* $KTH: krb-protos.h,v 1.3 1997/12/05 08:54:38 joda Exp $ */
+/*	$OpenBSD: krb-protos.h,v 1.3 1998/05/18 02:12:45 art Exp $	*/
+/*	$KTH: 	krb-protos.h,v 1.7 1998/04/04 17:56:36 assar Exp $	*/
 
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -45,6 +45,11 @@
 #include <stdarg.h>
 #include <time.h>
 
+#ifdef __GNUC__
+struct in_addr;
+struct sockaddr_in;
+#endif
+
 void
 afs_string_to_key __P((
 	char *str,
@@ -573,6 +578,16 @@ int
 krb_use_admin_server __P((int flag));
 
 int
+krb_verify_user_srvtab __P((
+	char *name,
+	char *instance,
+	char *realm,
+	char *password,
+	int secure,
+	char *linstance,
+	char *srvtab));
+
+int
 krb_verify_user __P((
 	char *name,
 	char *instance,
diff --git a/kerberosIV/include/kerberosIV/krb.h b/kerberosIV/include/kerberosIV/krb.h
index 540cf8b7024..2041cd26f91 100644
--- a/kerberosIV/include/kerberosIV/krb.h
+++ b/kerberosIV/include/kerberosIV/krb.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: krb.h,v 1.7 1997/12/12 05:30:11 art Exp $	*/
-/*      $KTH: krb.h,v 1.85 1997/10/24 10:18:16 assar Exp $      */
+/*	$OpenBSD: krb.h,v 1.8 1998/05/18 02:12:43 art Exp $	*/
+/*	$KTH: krb.h,v 1.92 1998/05/13 18:57:32 assar Exp $	*/
 
 /*
  * Copyright 1987, 1988 by the Student Information Processing Board
@@ -50,6 +50,11 @@ extern int krb_no_long_lifetimes; /* To disable AFS compatible lifetimes */
 extern int krbONE;
 #define         HOST_BYTE_ORDER (* (char *) &krbONE)
 
+/* Debug variables */
+extern int krb_debug;
+extern int krb_ap_req_debug;
+extern int krb_dns_debug;
+
 /* Text describing error codes */
 #define		MAX_KRB_ERRORS	256
 extern const char *krb_err_txt[MAX_KRB_ERRORS];
@@ -319,10 +324,6 @@ struct krb_host {
 
 extern char *krb4_version;
 
-struct in_addr;
-
-struct sockaddr_in;
-
 typedef int (*key_proc_t) __P((char*, char*, char*, void*, des_cblock*));
 
 typedef int (*decrypt_proc_t) __P((char*, char*, char*, void*,