Avoid <krb5/...> includes

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

17 files changed, 40 insertions, 44 deletions

diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index d98b432..a83c8d9 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:23:18 1995  John Gilmore  (gnu at toad.com)
+
+	* dump.c, test1.c:  Avoid <krb5/...> includes.
+
 Sun Oct 23 01:47:14 1994    (tytso@rsx-11)
 
 	* Makefile.in (check): Do checks for depth = 5
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index f0a94da..f6a0b30 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 01:23:57 1995  John Gilmore  (gnu at toad.com)
+
+	* krb5_decode_test.c, krb5_encode_test.c, ktest.h, ktest_equal.h,
+	utility.c, utility.h:  Avoid <krb5/...> includes.
+
 Tue Feb 14 00:18:35 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(LD) instead of $(CC) when linking.
diff --git a/src/tests/asn.1/krb5_decode_test.c b/src/tests/asn.1/krb5_decode_test.c
index c56dc8e..576c3fa 100644
--- a/src/tests/asn.1/krb5_decode_test.c
+++ b/src/tests/asn.1/krb5_decode_test.c
@@ -1,10 +1,10 @@
-#include <krb5/krb5.h>
+#include "krb5.h"
 #include "ktest.h"
-#include <com_err.h>
+#include "com_err.h"
 #include "utility.h"
 #include "ktest_equal.h"
 
-#include <krb5/asn1.h>
+#include "asn1.h"
 #include "debug.h"
 #include <string.h>
 
diff --git a/src/tests/asn.1/krb5_encode_test.c b/src/tests/asn.1/krb5_encode_test.c
index c821aa3..72c708a 100644
--- a/src/tests/asn.1/krb5_encode_test.c
+++ b/src/tests/asn.1/krb5_encode_test.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "asn1.h"
+#include "com_err.h"
 #include "utility.h"
 
 #include "ktest.h"
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index 29e5d4f..3465d24 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -1,7 +1,7 @@
 #ifndef __KTEST_H__
 #define __KTEST_H__
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 #define SAMPLE_USEC 123456
 #define SAMPLE_TIME 771228197  /* Fri Jun 10  6:03:17 GMT 1994 */
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index 0885974..5b71c43 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -1,7 +1,7 @@
 #ifndef __KTEST_EQUAL_H__
 #define __KTEST_EQUAL_H__
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 /* int ktest_equal_structure(krb5_structure *ref, *var) */
 /* effects  Returns true (non-zero) if ref and var are
diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c
index 6f911e3..324c989 100644
--- a/src/tests/asn.1/utility.c
+++ b/src/tests/asn.1/utility.c
@@ -1,4 +1,4 @@
-#include <krb5/krb5.h>
+#include "krb5.h"
 #include "utility.h"
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h
index 66ca4dc..0fda2c0 100644
--- a/src/tests/asn.1/utility.h
+++ b/src/tests/asn.1/utility.h
@@ -1,7 +1,7 @@
 #ifndef __UTILITY_H__
 #define __UTILITY_H__
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 #include "krbasn1.h"
 #include "asn1buf.h"
 
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 6b4908f..019d369 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:24:52 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_mkdums.c:  Avoid <krb5/...> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index db0b19a..33a3618 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -24,17 +24,8 @@
  * Edit a KDC database.
  */
 
-#include <krb5/copyright.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 <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <ss/ss.h>
 #include <stdio.h>
 
diff --git a/src/tests/dump.c b/src/tests/dump.c
index b6bde51..4cef05f 100644
--- a/src/tests/dump.c
+++ b/src/tests/dump.c
@@ -25,8 +25,7 @@
  */
 
 #include <stdio.h>
-
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 void dump_data (data)
     krb5_data *data;
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index b03e903..50650f3 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:25:13 1995  John Gilmore  (gnu at toad.com)
+
+	* kdc5_hammer.c, pp.c:  Avoid <krb5/...> includes.
+
 Mon Feb 06 17:19:04 1995 Chris Provenzano  (proven@mit.edu)
 
         * kdc5_hammer.c Removed krb5_keytype, changed krb5_enctype to
diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 8b7a7ea..5ebfa11 100644
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -26,13 +26,8 @@
 
 #include <stdio.h>
 
-#include <krb5/copyright.h>
-#include <krb5/osconf.h>
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 
 #define KRB5_DEFAULT_OPTIONS 0
 #define KRB5_DEFAULT_LIFE 60*60*8 /* 8 hours */
diff --git a/src/tests/hammer/pp.c b/src/tests/hammer/pp.c
index 4dafd2e..403d60d 100644
--- a/src/tests/hammer/pp.c
+++ b/src/tests/hammer/pp.c
@@ -9,7 +9,7 @@
  *
  */
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 void
 print_principal(p)
diff --git a/src/tests/test1.c b/src/tests/test1.c
index b62808d..ae7dc78 100644
--- a/src/tests/test1.c
+++ b/src/tests/test1.c
@@ -24,7 +24,7 @@
  * Regression tests for the kerberos library.
  */
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 unsigned char key_one[8] = { 0x10, 0x23, 0x32, 0x45, 0x54, 0x67, 0x76, 0x89 };
 unsigned char key_two[8] = { 0xea, 0x89, 0x57, 0x76, 0x5b, 0xcd, 0x0d, 0x34 };
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 914490a..b41e8ab 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:25:37 1995  John Gilmore  (gnu at toad.com)
+
+	* kdb5_verify.c:  Avoid <krb5/...> includes.
+
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
     * Added krb5_context to all krb5_routines
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index d66c3cb..ffd61b5 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -24,21 +24,11 @@
  * Edit a KDC database.
  */
 
-#include <krb5/copyright.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 <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <ss/ss.h>
 #include <stdio.h>
 
-
 #define REALM_SEP	'@'
 #define REALM_SEP_STR	"@"