15 files changed, 25 insertions, 6 deletions
diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog
index 26e4d0158..ba10fca8b 100644
--- a/src/kadmin/client/ChangeLog
+++ b/src/kadmin/client/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 20 11:45:10 1995    <tytso@rsx-11.mit.edu>
+
+	* kadmin.c, kadmin_add.c, kadmin_adr.c, kadmin_cpr.c kadmin_cpw.c,
+        kadmin_del.c, kadmin_done.c, kadmin_inq.c, kadmin_mod.c,
+        kadmin_msnd.c: Add include of adm_defs.h, since that's no longer
+		included by krb5.h.
+
 Fri Mar 17 15:36:07 1995  Chris Provenzano (proven@mit.edu)
 
         * kadmin_inq.c, kadmin.c:
diff --git a/src/kadmin/client/kadmin.c b/src/kadmin/client/kadmin.c
index b571affc9..65c89ea6d 100644
--- a/src/kadmin/client/kadmin.c
+++ b/src/kadmin/client/kadmin.c
@@ -36,6 +36,7 @@
 #endif
 
 #include "krb5.h"
+#include "adm_defs.h"
 
 static krb5_error_code get_first_ticket 
 	PROTOTYPE((krb5_context,
diff --git a/src/kadmin/client/kadmin_add.c b/src/kadmin/client/kadmin_add.c
index 6c98be9a0..c04eca844 100644
--- a/src/kadmin/client/kadmin_add.c
+++ b/src/kadmin/client/kadmin_add.c
@@ -30,7 +30,8 @@
 
 #include <sys/param.h>
 
-#include "krb5.h"
+#include "k5-int.h"
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_adr.c b/src/kadmin/client/kadmin_adr.c
index 52a8d3f73..9a4cea7f8 100644
--- a/src/kadmin/client/kadmin_adr.c
+++ b/src/kadmin/client/kadmin_adr.c
@@ -31,6 +31,7 @@
 #include <sys/param.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_cpr.c b/src/kadmin/client/kadmin_cpr.c
index d938ff3f5..ee0b946b6 100644
--- a/src/kadmin/client/kadmin_cpr.c
+++ b/src/kadmin/client/kadmin_cpr.c
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_cpw.c b/src/kadmin/client/kadmin_cpw.c
index 34d39acba..5705b9f5e 100644
--- a/src/kadmin/client/kadmin_cpw.c
+++ b/src/kadmin/client/kadmin_cpw.c
@@ -32,6 +32,7 @@
 #include <sys/param.h>
 
 #include <k5-int.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_del.c b/src/kadmin/client/kadmin_del.c
index 16ccfdffb..1753f007c 100644
--- a/src/kadmin/client/kadmin_del.c
+++ b/src/kadmin/client/kadmin_del.c
@@ -29,6 +29,7 @@
 #include <com_err.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_done.c b/src/kadmin/client/kadmin_done.c
index 6590096b0..7f3f7bb94 100644
--- a/src/kadmin/client/kadmin_done.c
+++ b/src/kadmin/client/kadmin_done.c
@@ -29,6 +29,7 @@
 #include <com_err.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 krb5_error_code
 kadm_done(context, auth_context, my_creds, local_socket, seqno)
diff --git a/src/kadmin/client/kadmin_inq.c b/src/kadmin/client/kadmin_inq.c
index 86afb8ca3..374455b7c 100644
--- a/src/kadmin/client/kadmin_inq.c
+++ b/src/kadmin/client/kadmin_inq.c
@@ -30,6 +30,7 @@
 #include <com_err.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_mod.c b/src/kadmin/client/kadmin_mod.c
index 88105281e..e7d565413 100644
--- a/src/kadmin/client/kadmin_mod.c
+++ b/src/kadmin/client/kadmin_mod.c
@@ -30,6 +30,7 @@
 #include <com_err.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 void decode_kadmind_reply();
 int print_status_message();
diff --git a/src/kadmin/client/kadmin_msnd.c b/src/kadmin/client/kadmin_msnd.c
index 7fc626de1..7887e435e 100644
--- a/src/kadmin/client/kadmin_msnd.c
+++ b/src/kadmin/client/kadmin_msnd.c
@@ -36,6 +36,7 @@
 #include <sys/stat.h>
 
 #include <krb5.h>
+#include "adm_defs.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 8bdc3f6d8..506f7ffbe 100644
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,8 +1,3 @@
-Fri Apr 14 22:02:27 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-
-	* kpasswd.c: Remove unneeded include of adm_defs.h (since it's now
-	        included by krb5.h)
-
 Fri Mar 17 15:36:07 1995  Chris Provenzano (proven@mit.edu)
 
 	* kpasswd.c: Cast malloc() return value to shut compiler up.
diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index 923735f79..5b1a182d0 100644
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -40,6 +40,7 @@
 #include <strings.h>
 #endif
 #include "com_err.h"
+#include "adm_defs.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 8cf428b4b..16dfcab4d 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 20 11:47:53 1995    <tytso@rsx-11.mit.edu>
+
+	* adm_extern.h: #include adm_defs.h, since that's no longer
+		included by krb5.h
 
 Mon Mar 27 07:56:26 1995 Chris Provenzano (proven@mit.edu)
 
diff --git a/src/kadmin/server/adm_extern.h b/src/kadmin/server/adm_extern.h
index d5c4cafe5..cc4940583 100644
--- a/src/kadmin/server/adm_extern.h
+++ b/src/kadmin/server/adm_extern.h
@@ -29,6 +29,8 @@
 #ifndef __ADM_EXTERN__
 #define __ADM_EXTERN__
 
+#include "adm_defs.h"
+
 typedef struct {
 	/* Client Info */
   struct sockaddr_in client_name;