From: John Gilmore <gnu@toad.com>
Date: Tue, 28 Feb 1995 10:25:13 +0000 (+0000)
Subject: * *.c:  Avoid <krb5/...> and <com_err.h> includes
X-Git-Tag: krb5-1.0-beta5~640
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=347ba456a7a60c2cf5b1e68c9d44b31534fa1e83;p=krb5.git

* *.c:  Avoid <krb5/...> and <com_err.h> includes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5030 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/client/ChangeLog b/src/kadmin/client/ChangeLog
index de9ac3bd3..c3a1175b1 100644
--- a/src/kadmin/client/ChangeLog
+++ b/src/kadmin/client/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:18:37 1995  John Gilmore  (gnu at toad.com)
+
+	* *.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * kadmin.c Call krb5_sendauth() with new calling convention
diff --git a/src/kadmin/client/kadmin.c b/src/kadmin/client/kadmin.c
index d5bdec417..93ce5e9ed 100644
--- a/src/kadmin/client/kadmin.c
+++ b/src/kadmin/client/kadmin.c
@@ -29,19 +29,13 @@
 #include <signal.h>
 #include <string.h>
 #include <pwd.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
 #endif
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 354814ea0..b8f15eba2 100644
--- a/src/kadmin/client/kadmin_add.c
+++ b/src/kadmin/client/kadmin_add.c
@@ -26,17 +26,10 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 8d5c4fcf9..7f9d75b0e 100644
--- a/src/kadmin/client/kadmin_adr.c
+++ b/src/kadmin/client/kadmin_adr.c
@@ -26,17 +26,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
-
+#include "com_err.h"
 #include <sys/param.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 c974aaf5f..fec738ebd 100644
--- a/src/kadmin/client/kadmin_cpr.c
+++ b/src/kadmin/client/kadmin_cpr.c
@@ -27,17 +27,11 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 02d1e117f..194e0f98b 100644
--- a/src/kadmin/client/kadmin_cpw.c
+++ b/src/kadmin/client/kadmin_cpw.c
@@ -27,17 +27,11 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 f96db1a7f..be4c9a91d 100644
--- a/src/kadmin/client/kadmin_del.c
+++ b/src/kadmin/client/kadmin_del.c
@@ -26,15 +26,8 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "com_err.h"
+#include "k5-int.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 5e9af2b2c..a9585851d 100644
--- a/src/kadmin/client/kadmin_done.c
+++ b/src/kadmin/client/kadmin_done.c
@@ -26,15 +26,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 krb5_error_code
 kadm_done(context, my_creds, rep_ret, local_addr, foreign_addr, 
diff --git a/src/kadmin/client/kadmin_inq.c b/src/kadmin/client/kadmin_inq.c
index 13f3bb6e6..aa46cadfe 100644
--- a/src/kadmin/client/kadmin_inq.c
+++ b/src/kadmin/client/kadmin_inq.c
@@ -27,15 +27,9 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.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 6bb9c22b9..d955e27ae 100644
--- a/src/kadmin/client/kadmin_mod.c
+++ b/src/kadmin/client/kadmin_mod.c
@@ -27,15 +27,8 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
-
-#include <krb5/adm_defs.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
+#include "com_err.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 7435ccdff..c106e2841 100644
--- a/src/kadmin/client/kadmin_msnd.c
+++ b/src/kadmin/client/kadmin_msnd.c
@@ -28,27 +28,14 @@
 #include <netdb.h>
 #include <signal.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/param.h>
 #include <pwd.h>
 
-#include <krb5/adm_defs.h>
-
 #include <sys/stat.h>
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/base-defs.h>
-#include <krb5/adm_err.h>
-#include <krb5/errors.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/krb5_err.h>
+#include "k5-int.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 856cf8947..8a4a74f5c 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:23:46 1995  John Gilmore  (gnu at toad.com)
+
+	* *.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb  3 07:50:14 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* adm_v4_pwd.c: Don't use BITS64, use SIZEOF_LONG
diff --git a/src/kadmin/server/adm_adm_func.c b/src/kadmin/server/adm_adm_func.c
index 6c23dd80b..7da1dd3c3 100644
--- a/src/kadmin/server/adm_adm_func.c
+++ b/src/kadmin/server/adm_adm_func.c
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -38,13 +38,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 #ifdef SANDIA
diff --git a/src/kadmin/server/adm_check.c b/src/kadmin/server/adm_check.c
index b36c03df5..67cd24bde 100644
--- a/src/kadmin/server/adm_check.c
+++ b/src/kadmin/server/adm_check.c
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -39,12 +39,8 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/adm_err.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
+#include "adm_err.h"
 #include "adm_extern.h"
 
 krb5_error_code
diff --git a/src/kadmin/server/adm_extern.c b/src/kadmin/server/adm_extern.c
index 98b21fe8c..ca27149e6 100644
--- a/src/kadmin/server/adm_extern.c
+++ b/src/kadmin/server/adm_extern.c
@@ -27,13 +27,7 @@
  * allocations of adm_extern stuff
  */
 
-
-#include <krb5/copyright.h>
-
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/osconf.h>
+#include "k5-int.h"
 
 /* real declarations of KDC's externs */
 krb5_encrypt_block master_encblock;
diff --git a/src/kadmin/server/adm_extern.h b/src/kadmin/server/adm_extern.h
index 1b8ae365f..fb43d37f0 100644
--- a/src/kadmin/server/adm_extern.h
+++ b/src/kadmin/server/adm_extern.h
@@ -26,8 +26,6 @@
  * <<< Description >>>
  */
 
-#include <krb5/copyright.h>
-
 #ifndef __ADM_EXTERN__
 #define __ADM_EXTERN__
 
diff --git a/src/kadmin/server/adm_fmt_inq.c b/src/kadmin/server/adm_fmt_inq.c
index 9914b6abc..40c79a1fe 100644
--- a/src/kadmin/server/adm_fmt_inq.c
+++ b/src/kadmin/server/adm_fmt_inq.c
@@ -27,13 +27,7 @@
  * 	Administrative Display Routine
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-
+#include "k5-int.h"
 #include <stdio.h>
 
 #ifdef HAVE_SYS_TIME_H
diff --git a/src/kadmin/server/adm_funcs.c b/src/kadmin/server/adm_funcs.c
index 6951954b0..5f86e1c24 100644
--- a/src/kadmin/server/adm_funcs.c
+++ b/src/kadmin/server/adm_funcs.c
@@ -27,8 +27,7 @@
  * Modify the Kerberos Database
  */
 
-
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
  
 #include <sys/socket.h>
@@ -37,21 +36,10 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/asn1.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
+#include "adm_err.h"
 #include "adm_extern.h"
 
-#include <krb5/adm_err.h>
-#include <krb5/errors.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/krb5_err.h>
-
 struct saltblock {
     int salttype;
     krb5_data saltdata;
diff --git a/src/kadmin/server/adm_kadmin.c b/src/kadmin/server/adm_kadmin.c
index a499e557e..e58774b54 100644
--- a/src/kadmin/server/adm_kadmin.c
+++ b/src/kadmin/server/adm_kadmin.c
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 #include <syslog.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,11 +29,7 @@
 #include <arpa/inet.h>
 #endif
  
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
  
 krb5_error_code
diff --git a/src/kadmin/server/adm_kpasswd.c b/src/kadmin/server/adm_kpasswd.c
index ce7b308bf..033533e55 100644
--- a/src/kadmin/server/adm_kpasswd.c
+++ b/src/kadmin/server/adm_kpasswd.c
@@ -23,7 +23,7 @@
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -31,11 +31,7 @@
 #include <arpa/inet.h>
 #endif
  
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
  
 extern krb5_encrypt_block master_encblock;
diff --git a/src/kadmin/server/adm_listen.c b/src/kadmin/server/adm_listen.c
index 803a64fc2..d1b8d9a55 100644
--- a/src/kadmin/server/adm_listen.c
+++ b/src/kadmin/server/adm_listen.c
@@ -24,16 +24,11 @@
 #include <sys/select.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/sysincl.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 
 #include <syslog.h>
 #include <signal.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #ifndef sigmask
 #define sigmask(m)    (1 <<((m)-1))
diff --git a/src/kadmin/server/adm_nego.c b/src/kadmin/server/adm_nego.c
index a6edff3f2..d7c09b633 100644
--- a/src/kadmin/server/adm_nego.c
+++ b/src/kadmin/server/adm_nego.c
@@ -28,7 +28,7 @@
  */
 
 
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
 
 #include <sys/socket.h>
@@ -39,13 +39,7 @@
 
 #include <stdio.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-
-#include <krb5/adm_defs.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 krb5_error_code
diff --git a/src/kadmin/server/adm_network.c b/src/kadmin/server/adm_network.c
index 6d31f8b09..58cc9fc5a 100644
--- a/src/kadmin/server/adm_network.c
+++ b/src/kadmin/server/adm_network.c
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/param.h>
@@ -39,11 +39,7 @@
 #endif
 #include <netdb.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/adm_defs.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 extern int errno;
diff --git a/src/kadmin/server/adm_parse.c b/src/kadmin/server/adm_parse.c
index aaf7b31d4..305807b47 100644
--- a/src/kadmin/server/adm_parse.c
+++ b/src/kadmin/server/adm_parse.c
@@ -27,7 +27,6 @@
  *
  * Edit a KDC database.
  */
-
  
 #include <syslog.h>
 #include <stdio.h>
@@ -41,9 +40,7 @@
 #include <time.h>
 #endif  /* aux20 */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 
 void
 kadmin_parse_and_set(input_string)
diff --git a/src/kadmin/server/adm_process.c b/src/kadmin/server/adm_process.c
index 59f95117c..786c6898c 100644
--- a/src/kadmin/server/adm_process.c
+++ b/src/kadmin/server/adm_process.c
@@ -23,7 +23,7 @@
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -31,11 +31,7 @@
 #include <arpa/inet.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/kdb.h>
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 extern krb5_encrypt_block master_encblock;
diff --git a/src/kadmin/server/adm_server.c b/src/kadmin/server/adm_server.c
index d29599ba5..33020eb5a 100644
--- a/src/kadmin/server/adm_server.c
+++ b/src/kadmin/server/adm_server.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <string.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #include <signal.h>
 #ifndef sigmask
@@ -42,15 +42,7 @@
 #include <varargs.h>
 #endif
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/mit-des.h>
-#include <krb5/kdb_dbm.h>
-
-#include <krb5/adm_defs.h>
+#include "k5-int.h"
 #include "adm_extern.h"
 
 char prog[32];
diff --git a/src/kadmin/server/adm_v4_pwd.c b/src/kadmin/server/adm_v4_pwd.c
index 26ba0e635..b74d92372 100644
--- a/src/kadmin/server/adm_v4_pwd.c
+++ b/src/kadmin/server/adm_v4_pwd.c
@@ -83,14 +83,7 @@ typedef struct {
 } V4_Principal;
 
         /* V5 Definitions */
-#include <krb5/adm_defs.h>
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/encryption.h>
-#include <krb5/mit-des.h>
-
+#include "k5-int.h"
 #include "adm_extern.h"
 
 struct saltblock {