Avoid <krb5/...> includes

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

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 9cfddf42a0360a28fc9ca3ea836a5592c33d5447..e84f31e914b922396e63629aba95ebd20badcc9a 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:33:52 1995  John Gilmore  (gnu at toad.com)
+
+       * glue4.c:  Avoid <krb5/...> includes.
+
 Thu Oct  6 20:06:06 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * configure.in: Add recursive "make check" target.

diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog
index a9439e8036966b453cb670dadb90b4f7644b9dfa..88137efd1b432edd65efa833a3801c71fbf7a561 100644 (file)
--- a/src/lib/des425/ChangeLog
+++ b/src/lib/des425/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 01:30:11 1995  John Gilmore  (gnu at toad.com)
+
+       * cksum.c, des.c, des.h, enc_dec.c, pcbc_encrypt.c, quad_cksum.c,
+       read_passwd.c, string2key.c, weak_key.c:  Avoid <krb5/...> includes.
+
 Tue Feb 21 17:42:44 1995 Keith Vetter (keithv@fusion.com)
 
         * Makefile.in: made to work on the PC

diff --git a/src/lib/des425/cksum.c b/src/lib/des425/cksum.c
index 519b4ac4cf2e7bb7562ccd78cf94b09a34053809..568e706af0b75b4c6d66713b12d084992f1e4ebc 100644 (file)
--- a/src/lib/des425/cksum.c
+++ b/src/lib/des425/cksum.c
@@ -36,7 +36,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * This routine performs DES cipher-block-chaining checksum operation,

diff --git a/src/lib/des425/des.c b/src/lib/des425/des.c
index 93e07e65ace4185c3846029435f5606ee28452c3..289061ae6f65bc1cf6dc0439419f427c66d0d906 100644 (file)
--- a/src/lib/des425/des.c
+++ b/src/lib/des425/des.c
@@ -50,7 +50,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 int INTERFACE
 des_ecb_encrypt(clear, cipher, schedule, encrypt)

diff --git a/src/lib/des425/des.h b/src/lib/des425/des.h
index 7d4f61599f5e2f741b625763f3b7ad9f6bba975c..893f2503ffb6f5a3d168aa3b3090e753eba5b01e 100644 (file)
--- a/src/lib/des425/des.h
+++ b/src/lib/des425/des.h
@@ -31,8 +31,7 @@
 #ifndef DES_DEFS
 #define DES_DEFS
 
-#include <krb5/krb5.h>
-#include <krb5/mit-des.h>
+#include "k5-int.h"
 
 typedef mit_des_cblock des_cblock;     /* crypto-block size */
 

diff --git a/src/lib/des425/enc_dec.c b/src/lib/des425/enc_dec.c
index a221a34832b6f2afbd5b1b1b9229c480b498ee1f..90de9253a26c81ceb66a6f9154981e8466597830 100644 (file)
--- a/src/lib/des425/enc_dec.c
+++ b/src/lib/des425/enc_dec.c
@@ -37,7 +37,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * This routine performs DES cipher-block-chaining operation, either

diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c
index 06258cf8be9c6ad13ebdadc8591adb7c1792013a..ea8948b7eb0ddb8b66952ccd21251b771ebfd1c6 100644 (file)
--- a/src/lib/des425/pcbc_encrypt.c
+++ b/src/lib/des425/pcbc_encrypt.c
@@ -18,9 +18,8 @@
 /* 
  * copy of include/des.h to avoid collision with local one
  */
-#include <krb5/copyright.h>
-#include <krb5/config.h>
-#include <krb5/osconf.h>
+#include "k5-config.h"
+#include "osconf.h"
 
 #ifndef KRB_INT32
 #if (SIZEOF_LONG == 4)

diff --git a/src/lib/des425/quad_cksum.c b/src/lib/des425/quad_cksum.c
index 0a9628b48cabd92b4731890f3bb01ec983c12c49..4654a10376274a11fe607ec84921d87268f0170b 100644 (file)
--- a/src/lib/des425/quad_cksum.c
+++ b/src/lib/des425/quad_cksum.c
@@ -86,8 +86,7 @@
 #include <errno.h>
 
 /* Application include files */
-#include <krb5/krb5.h>
-#include <krb5/mit-des.h>
+#include "k5-int.h"
 #include "des.h"
 /* Definitions for byte swapping */
 

diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c
index d6f0c78fcc6212141983766a0c23b15416f13f87..e622859786b5e051a89c3e6d46d1db092de22480 100644 (file)
--- a/src/lib/des425/read_passwd.c
+++ b/src/lib/des425/read_passwd.c
@@ -27,10 +27,6 @@
  * echoing.
  */
 
-
-#include <krb5/krb5.h>
-#include <krb5/los-proto.h>
-
 #include "des.h"
 
 static krb5_context krb4_global_context = 0;

diff --git a/src/lib/des425/string2key.c b/src/lib/des425/string2key.c
index 826065c2b4a208754799b4075f442b4b54be28d1..89c8169554588fa6e45ed5c02232c8cdb2cb76e9 100644 (file)
--- a/src/lib/des425/string2key.c
+++ b/src/lib/des425/string2key.c
@@ -26,8 +26,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
-
 #include "des_int.h"
 
 #ifdef DEBUG

diff --git a/src/lib/des425/weak_key.c b/src/lib/des425/weak_key.c
index 14f67eabd2e846ff51d5db2b10d7b24040cc4471..cab80d40077c417d7964eb766830357cab0b2d99 100644 (file)
--- a/src/lib/des425/weak_key.c
+++ b/src/lib/des425/weak_key.c
@@ -31,7 +31,6 @@
 
 
 #include "des.h"
-#include <krb5/ext-proto.h>
 
 /*
  * mit_des_is_weak_key: returns true iff key is a [semi-]weak des key.

diff --git a/src/lib/glue4.c b/src/lib/glue4.c
index 08566f0c139c00774b096a77f76ef6fe5c5b1375..bf9bbd8a0f5f8231fb292d2e7ede62e417e03739 100644 (file)
--- a/src/lib/glue4.c
+++ b/src/lib/glue4.c
@@ -1,4 +1,4 @@
-#include <krb5/krb5.h>
+#include "krb5.h"
 
 krb5_data string_list[3] = {
 {11, "FOO.MIT.EDU"},

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 9b8bd0dcb7bff063e46f967bee2ecdb19afe651b..0203ec037afdc8c51392b3930b53c04dbd4cbea7 100644 (file)
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:21:52 1995  John Gilmore  (gnu at toad.com)
+
+       * kprop.c, kpropd.c:  Avoid <krb5/...> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * kprop.c Call krb5_sendauth() with new calling convention.

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 649094c865995b5c046b744d18a23a1b7440eb8e..b699cc7fca6efc7c90684d948cc43659eac44579 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -38,15 +38,8 @@
 #include <sys/param.h>
 #include <netdb.h>
 
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/libos.h>
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 
 #ifdef NEED_SYS_FCNTL_H
 #include <sys/fcntl.h>

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 646b65e090293be9e23bd3aa91d3c515f3f36793..de6ef5a4e7bfeddd48b2df55c794145d13668518 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -50,15 +50,8 @@
 #include <netdb.h>
 #include <syslog.h>
 
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/osconf.h>
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/libos.h>
-#include <com_err.h>
+#include "k5-int.h"
+#include "com_err.h"
 #include <errno.h>
 
 #include "kprop.h"

diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index d98b432cfc4a5c5e17963d1e90992b3f899210e3..a83c8d9e92eca28165458182de49f2848c302856 100644 (file)
--- 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 f0a94dad762eaaa4d6ad48f54d88f683ad239f3f..f6a0b30ac7f9e897c794e510f31bc5b62f3225ed 100644 (file)
--- 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 c56dc8e7bb179f6333dd5cfdee7651e518268a52..576c3fad79840c4bdbe984124ee08a1376edd047 100644 (file)
--- 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 c821aa338a4b2380d4e4305d702bdae7e75b49a9..72c708aaae8e2f85b370e0865a7ca391006881a9 100644 (file)
--- 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 29e5d4f46764a733858711b18eebb49d7da8f768..3465d244ce18e39879368dde0af52a2f8df479ce 100644 (file)
--- 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 0885974e8b0f124582cefb152aa1c91784230213..5b71c437d8ec802641025c88ddafd5c788aa2c80 100644 (file)
--- 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 6f911e370b23c4afdec67c3b4d23dfb9dedcd7ce..324c98976a92c6bf182b6a4329a535d51bfe1eb2 100644 (file)
--- 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 66ca4dc8690f34b63a3331e62431558eabc73031..0fda2c00a6f2f76438f836aadc57afe5c2d16dbd 100644 (file)
--- 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 6b4908f26dbdc409f703b02bba15c9f4698f9e50..019d36928713e571d9b84a5e7f523ddc9cfcc571 100644 (file)
--- 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 db0b19ac70c19563f19265348aca5578f8ab38b2..33a361825e2e54b98e01a2a236c6a528b9f24126 100644 (file)
--- 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 b6bde51c8d01c68195a251433b7c3faa6f52ccc0..4cef05f535a5fea27019c6bbd494ad0ee1d98b87 100644 (file)
--- 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 b03e90377ae062a644936e463a8f8f790d61edb2..50650f3eb349d7398b0d1eb3332d29b220ebf0c9 100644 (file)
--- 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 8b7a7ea4b1b61bd6f50c10946f3eefd27e19e377..5ebfa11229a19df8193e619dcfbd6dacf6ca79ee 100644 (file)
--- 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 4dafd2ecab64186319d28f022daf8e530a248ff8..403d60de8f8072c1c5539a98a830bb4f260d6175 100644 (file)
--- 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 b62808d1d09b8ffcda5e402b3821524e97b10c05..ae7dc78ef4e214b2d0c0ebd17165e3a8dc253353 100644 (file)
--- 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 914490a78975f880eeb34ad291a0da3492b3e6e7..b41e8ab42be383a7f19345ebfdff0ae0ff6e4eeb 100644 (file)
--- 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 d66c3cb280c8c18b387da11dfc96b54276f18f5f..ffd61b5bba122943bf4056685297e0b5716d2c48 100644 (file)
--- 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  "@"