Avoid <krb5/...> and <com_err.h> includes

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

diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog
index 1b816cebb1eade613f3a49f3f6647a33117c66f1..4475b44113e9b9a833631977018327c923f21b82 100644 (file)
--- a/src/admin/aname/ChangeLog
+++ b/src/admin/aname/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:04:08 1995  John Gilmore  (gnu at toad.com)
+
+       * kdb5_anadd.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Mon Oct  3 19:11:27 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * Makefile.in: Use $(srcdir) to find manual page for make install.

diff --git a/src/admin/aname/kdb5_anadd.c b/src/admin/aname/kdb5_anadd.c
index a5bbe78d93a87375f0c2ce4372468987d264a6d7..2849abc979150208e9119086d60fc6a9df698074 100644 (file)
--- a/src/admin/aname/kdb5_anadd.c
+++ b/src/admin/aname/kdb5_anadd.c
@@ -24,13 +24,9 @@
  * Program to add/delete entries to/from the aname translation database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
-#include <krb5/ext-proto.h>
-#include <krb5/dbm.h>
+#include "k5-int.h"
 #include <sys/file.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <stdio.h>
 #include <errno.h>
 

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index e89f280a765ee8aadca99816154350c25ca08cbe..d07fa8105acc28c797be6768ca1591b13aaa772c 100644 (file)
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:04:57 1995  John Gilmore  (gnu at toad.com)
+
+       * kdb5_convert.c:  Avoid <krb5/...> and <com_err.h> includes.   
+
 Tue Nov 15 23:55:56 1994  Mark Eichin  (eichin@cygnus.com)
 
        * kdb5_convert.c (enter_in_v5_db): use the correct instance for

diff --git a/src/admin/convert/kdb5_convert.c b/src/admin/convert/kdb5_convert.c
index 62274e08f6af93d2d2328d3457004911fe648b2d..eccf2282bcfab32daa09f7ebbc18051d3e680482 100644 (file)
--- a/src/admin/convert/kdb5_convert.c
+++ b/src/admin/convert/kdb5_convert.c
@@ -39,19 +39,10 @@ static C_Block master_key;
 static Key_schedule master_key_schedule;
 static long master_key_version;
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
-#include <krb5/ext-proto.h>
-
 #include <netinet/in.h>                        /* ntohl */
 
 #define PROGNAME argv[0]

diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog
index 8e5b29e5d098a3f0540ee532240cb8fb90fad339..ade471ba245452c0e91bb8cdf95d8682b350adef 100644 (file)
--- a/src/admin/create/ChangeLog
+++ b/src/admin/create/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:05:32 1995  John Gilmore  (gnu at toad.com)
+
+       * kdb5_create.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines

diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 9cf726c3d792e65c1847303b70fab0e71994867f..eaaf248a90fc3ec4e2d623490a415a01fffcda8b 100644 (file)
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -24,19 +24,10 @@
  * Generate (from scratch) a Kerberos KDC database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
-
-#include <krb5/ext-proto.h>
-
 enum ap_op {
     NULL_KEY,                          /* setup null keys */
     MASTER_KEY,                                /* use master key as new key */

diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog
index 03424276bae00bd95171d6e78126a2d8cb41b815..3f338a0832692ced581b439f6ea6108187ffe9dd 100644 (file)
--- a/src/admin/destroy/ChangeLog
+++ b/src/admin/destroy/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:05:53 1995  John Gilmore  (gnu at toad.com)
+
+       * kdb5_destroy.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines

diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index d10b2ffab108337f2e5cae3a9eb289cc2f597476..7eeb04c7245b7cb263119a31531c1eac1f8c58bb 100644 (file)
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.c
@@ -26,14 +26,9 @@
  * This version knows about DBM format databases.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
+#include "k5-int.h"
 #include <stdio.h>
-
-#include <com_err.h>
-#include <krb5/ext-proto.h>
-#include <krb5/sysincl.h>              /* for MAXPATHLEN */
+#include "com_err.h"
 
 extern int errno;
 

diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index ec2ec45e6c39b177cd2688ed61ca1267d2d06afc..60baab1787cca127d3ba5459b368cc650f505cd1 100644 (file)
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 02:06:26 1995  John Gilmore  (gnu at toad.com)
+
+       * dump.c, dumpv4.c, kdb5_edit.c, ss_wrapper.c, tcl_wrapper.c,
+       util.c: Avoid <krb5/...> includes.
+
 Thu Feb 23 19:52:35 1995  Mark Eichin  (eichin@cygnus.com)
 
        * kdb5_edit.c: add struct timeb and sys/timeb includes from

diff --git a/src/admin/edit/dump.c b/src/admin/edit/dump.c
index 90fb7815622eaf04c0dbe70e148201e0d683ccc8..2f888c4500cd13b9d85248bf82a84e76e85e2ff4 100644 (file)
--- a/src/admin/edit/dump.c
+++ b/src/admin/edit/dump.c
@@ -24,20 +24,10 @@
  * Dump a KDC database
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>              /* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
-#include <stdio.h>
-
+#include "k5-int.h"
+#include "com_err.h"
 #include "kdb5_edit.h"
+#include <stdio.h>
 
 struct dump_record {
        char    *comerr_name;

diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c
index eec85f52d75a63fb4bc2113312c6a1131dff7bb8..3924f0f5696cf6a2e5e974fc88fc1f23b44f35a2 100644 (file)
--- a/src/admin/edit/dumpv4.c
+++ b/src/admin/edit/dumpv4.c
@@ -32,19 +32,9 @@
 /* MKEYFILE is now defined in kdc.h */
 #include <kdc.h>
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>              /* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-#include <krb5/func-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
-
 #include "kdb5_edit.h"
 
 struct dump_record {

diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index c734eef4c31e66123b8e0e61189447c75f16702e..545daf8d37101839dfd3d8c74594ba098fa8ebae 100644 (file)
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -24,16 +24,8 @@
  * Edit a KDC database.
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/sysincl.h>              /* for MAXPATHLEN */
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 #include <time.h>
 /* timeb is part of the interface to get_date. */

diff --git a/src/admin/edit/ss_wrapper.c b/src/admin/edit/ss_wrapper.c
index 3f86c45a43825d6bb926a3c6288dcb1b652bf477..4ac58eee071e94b3e23a00b224a9bc1cb5f2f88d 100644 (file)
--- a/src/admin/edit/ss_wrapper.c
+++ b/src/admin/edit/ss_wrapper.c
@@ -24,7 +24,7 @@
  * ss wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <ss/ss.h>
 #include <stdio.h>

diff --git a/src/admin/edit/tcl_wrapper.c b/src/admin/edit/tcl_wrapper.c
index 55b08d4e8256a7ad212008c1adae91999caf287d..a8f0722cc1cfcd5a6d2116679c306959c5d6c6a7 100644 (file)
--- a/src/admin/edit/tcl_wrapper.c
+++ b/src/admin/edit/tcl_wrapper.c
@@ -24,7 +24,7 @@
  * Tcl wrapper for kdb5_edit
  */
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
 #include "kdb5_edit.h"
 #include <tcl.h>
 

diff --git a/src/admin/edit/util.c b/src/admin/edit/util.c
index cc9597e487b6afa87e49d6675443989e701bac30..3a23c9a84dd0aa41b936160c3dc58c90fd0337ce 100644 (file)
--- a/src/admin/edit/util.c
+++ b/src/admin/edit/util.c
@@ -30,11 +30,7 @@
  * 
  */
 
-#include <krb5/krb5.h>
-#include <krb5/kdb.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-
+#include "k5-int.h"
 #include "./kdb5_edit.h"
 
 #if defined(sysvimp) || ( defined(mips) && defined(SYSTYPE_BSD43)) || (defined(vax) && !defined(ultrix))

diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index a5b7ef753fd618786c4eed96ee3217d78a005875..51a88d7a149c547500f7728f898950cbe184ff70 100644 (file)
--- a/src/admin/stash/ChangeLog
+++ b/src/admin/stash/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:08:04 1995  John Gilmore  (gnu at toad.com)
+
+       * kdb5_stach.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines

diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index a13ec0929aa89125c90e3397eb5b584993d43ed8..1cc87def0d6901b7d82be6d48588789b6c88ecc2 100644 (file)
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -24,15 +24,8 @@
  * Store the master database key in a file.
  */
 
-#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/sysincl.h>
-#include <krb5/osconf.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <stdio.h>
 
 extern int errno;

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 356863f3c7e759485724b20fc8207b6134346b58..f64f8edcae2eb6cdea71e07e70c6f08dbb71ff98 100644 (file)
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:10:17 1995  John Gilmore  (gnu at toad.com)
+
+       * kdestroy.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 10 18:46:17 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that

diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index 2b8ff4c734d4c9d59a7b7ba4e1c51a22d3187a61..9e4714d9467c443784e5eb6e999060e4b3c6aab7 100644 (file)
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -26,10 +26,8 @@
 
 #include <stdio.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 
 extern int optind;
 extern char *optarg;

diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index fb717996a62ea019678af185b1dac5d10dedbf85..d5ce03ac4a44c9ca1317ebdbee27fab68d7de1de 100644 (file)
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:10:44 1995  John Gilmore  (gnu at toad.com)
+
+       * kinit.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Mon Feb 13 23:50:52 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * Makefile.in: Use $(LD) instead of $(CC) when linking.

diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index de6c2acc1f86e2e3ca63936b8d48a87d21ee28fe..9a2572223e751513449938aaca606c21ef2daefc 100644 (file)
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -25,12 +25,10 @@
  */
 
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <pwd.h>
 
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
+#include "krb5.h"
 
 #define KRB5_DEFAULT_OPTIONS 0
 #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 3fde40fc0ec9bdf742ab8337e5707efa0b8d666e..fe6412b46c0f5fffbe634120ecdf7ad69a2d0ff9 100644 (file)
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:11:02 1995  John Gilmore  (gnu at toad.com)
+
+       * klist.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 10 18:44:44 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * Makefile.in (ISODELIB): Remove ISODE cruft.  Use $(LIBS) so that

diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index bfc8df7a9ef12e7885cc205654c72ad18eea42f4..e59b24ce9f3a3a7a232c75af5ef9dc75004b17b3 100644 (file)
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -25,10 +25,8 @@
  */
 
 #include <stdio.h>
-
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include <time.h>
 
 extern int optind;

diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 92a17a0a5d050bf58580aba5fe26ad51d813d236..3e9245244470da30977e340f59e4ceba647de2f9 100644 (file)
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:11:21 1995  John Gilmore  (gnu at toad.com)
+
+       * ksu.h:  Avoid <krb5/...> and <com_err.h> includes.
+
 Fri Feb 17 18:10:04 1995 Chris Provenzano  (proven@mit.edu)
 
        * krb_auth_su.c krb5_auth_check()) Call krb5_get_cred_from_kdc()

diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h
index 013230fbaf7b2347b7201a5c993ee49c1ad424b6..8fa0acc215d05a84401b39c1a0dae364b2fb2b61 100644 (file)
--- a/src/clients/ksu/ksu.h
+++ b/src/clients/ksu/ksu.h
@@ -25,16 +25,9 @@
  * KSU was writen by:  Ari Medvinsky, ari@isi.edu
  */
 
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/dbm.h>
-
-#include <krb5/osconf.h>
-#include <krb5/sysincl.h>
+#include "k5-int.h"
 #include <stdio.h>
-#include <com_err.h>
+#include "com_err.h"
 #include <sys/types.h> 
 #include <sys/param.h>
 #include <pwd.h>