Pull up r17489, r17494, r17495, r17499 from trunk, along with some

back-porting due to divergence caused by DAL integration.

ticket: 3236
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17503 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 1e2ef44f03384e54e1e7eb1f4aa6a5ff4e96ada4..971183523d9cc753d6e99f69f118739d1f624327 100644 (file)
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * kadmin.c: Include errno.h instead of k5-int.h.
+       * keytab.c: Include errno.h.
+
 2005-02-11  Tom Yu  <tlyu@mit.edu>
 
        * kadmin.c (kadmin_startup): New flag "-N" to prevent fallback to

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 957659dad77ad65cca5eafddd49e0c639a43f325..029c75e65db6d1f6cafd5b5e668fa00b94b18816 100644 (file)
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -28,6 +28,7 @@
 #include <krb5.h>
 #include <kadm5/admin.h>
 #include <krb5/adm_proto.h>
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>

diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
index 49fdc20b89d0f4aae12b0ffec0effa291b1e3573..77034fedd07e546855cfa20b5dee58a64b770e2f 100644 (file)
--- a/src/kadmin/cli/keytab.c
+++ b/src/kadmin/cli/keytab.c
@@ -38,6 +38,7 @@ static char *rcsid = "$Header$";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include <krb5.h>
 #include <kadm5/admin.h>

diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index f34d8f83c30d0d3faf81ad6da915e07962f3a247..9bc3f2c195047ccf59e5b52c892be7ee4e8d6a34 100644 (file)
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * tcl_kadm5.c, tcl_ovsec_kadm.c: Don't include k5-int.h.
+
 2005-02-10  Tom Yu  <tlyu@mit.edu>
 
        * tcl_kadm5.c (unparse_err): Add entries for KRB5_CC_NOTFOUND and

diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
index a6b945277c72b9905c880f0d845550bf2396cbf9..af275bdfb23bbf486d6cef5388b551c2dc4a1716 100644 (file)
--- a/src/kadmin/testing/util/tcl_kadm5.c
+++ b/src/kadmin/testing/util/tcl_kadm5.c
@@ -8,7 +8,6 @@
 #define USE_KADM5_API_VERSION 2
 #include <kadm5/admin.h>
 #include <com_err.h>
-#include <k5-int.h>
 #include <errno.h>
 #include <stdlib.h>
 #include "tcl_kadm5.h"

diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index e67b84d5c3a806b31afe5a825d71c60f1ceb974c..b4b2f42583d38f8267d361acf8bc904447452125 100644 (file)
--- a/src/kadmin/testing/util/tcl_ovsec_kadm.c
+++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c
@@ -8,7 +8,6 @@
 #define USE_KADM5_API_VERSION 1
 #include <kadm5/admin.h>
 #include <com_err.h>
-#include <k5-int.h>
 #include <errno.h>
 #include <stdlib.h>
 #include "tcl_kadm5.h"

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 165f2d072be05ef3c9b4e5c75bde2ee17d7f7164..43456f2d0927d0e5aeca7eb3f258904344142c8c 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * fakeka.c: Include errno.h.
+
 2005-10-13  Tom Yu  <tlyu@mit.edu>
 
        * kdc_preauth.c (etype_info_as_rep_helper): New function; shared

diff --git a/src/kdc/fakeka.c b/src/kdc/fakeka.c
index 452d8d3d86e6d74ec6e9c9c173a638b09e35ff14..08ad43318c577fae2672519a5b2a1cd6afc6d11a 100644 (file)
--- a/src/kdc/fakeka.c
+++ b/src/kdc/fakeka.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <syslog.h>
 #include <ctype.h>
+#include <errno.h>
 #include <netdb.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 0dea38dd6c90641f005b337b81e8f548d36950ac..ea27fa392e1df9eeabdbf279972950dfb71f2f14 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * krb524d.c: Include k5-int.h instead of krb5.h.
+
 2004-09-08  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (install-unix): Install krb524d manpage.

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 5b3641bcc278f01bc4f86aaa52e2b9c67a85bb14..c834d5f93efdfeb87acc18c6db15ddc1da8b0629 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -41,7 +41,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <krb5.h>
+#include <k5-int.h>
 #include <kadm5/admin.h>
 #include <krb5/adm_proto.h>
 #include <com_err.h>

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index fa03524a3aff5da880fa1a4ea0247888539a54ba..80f269ea7ad2732840f713610c336ac04f43cfbe 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * t_hmac.c, t_pkcs5.c: Don't include krb5.h.
+
 2005-03-15  Jeffrey Altman <jaltman@mit.edu>
 
         * keyed_cksum.c: (krb5_c_is_keyed_cksum): this is a boolean 

diff --git a/src/lib/crypto/t_hmac.c b/src/lib/crypto/t_hmac.c
index 8208eddeded1f6de155470aecf92d4dcdcb58884..000e64b8559ec24cacac46d10de4b327fa4905ba 100644 (file)
--- a/src/lib/crypto/t_hmac.c
+++ b/src/lib/crypto/t_hmac.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <krb5.h>
 #include "hash_provider.h"
 
 #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0]))

diff --git a/src/lib/crypto/t_pkcs5.c b/src/lib/crypto/t_pkcs5.c
index db255280a5d907590416ace65b7909b76ebbc6ac..fa1f43dea695d2e6c03ab755831adc63830ed4a8 100644 (file)
--- a/src/lib/crypto/t_pkcs5.c
+++ b/src/lib/crypto/t_pkcs5.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <krb5.h>
 
 #include "k5-int.h"
 

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ec6b1341fb67a5d2f71b03dadcd903bda3cd2663..0e6c3a4718b8b97ee522a9bbccc924ee4a3845c7 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Jeffrey Altman <jaltman@mit.edu>
+
+       * gssapi_krb5.hin: include k5-int.h instead of krb5.h
+
 2005-10-20  Alexandra Ellwood <lxs@mit.edu>, Jeffrey Altman <jaltman@mit.edu>
        
        * acquire_cred.c (acquire_init_cred):

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index cf78b94b86691bd64670d3f38e1627f9d5b88bb8..7d7599c61016178a8aa137e73757a61220973823 100644 (file)
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -47,7 +47,7 @@
 #ifndef _GSSAPIP_KRB5_H_
 #define _GSSAPIP_KRB5_H_
 
-#include <krb5.h>
+#include <k5-int.h>
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 0e0ae8acf7bbf62e7866449e97d6beb07e0bf2ed..c6fbecf1fbb0dccce7741269b96748ba7081d1a0 100644 (file)
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-28  Tom Yu  <tlyu@mit.edu>
+
+       * adb.h: Include errno.h and krb5.h instead of k5-int.h.
+
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * admin.h: Include kdb.h instead of k5-int.h.
+       * kadm_rpc_xdr.c, server_internal.h: Include errno.h instead of
+       k5-int.h.
+
 2004-08-20  Tom Yu  <tlyu@mit.edu>
 
        * admin.h (KADM5_CONFIG_NO_AUTH): New flag.

diff --git a/src/lib/kadm5/adb.h b/src/lib/kadm5/adb.h
index 8b53b55014d25808d47a0bc1a8807b881bfad25a..ce953a0e771de149a3301e15a7fdc63cbd3da270 100644 (file)
--- a/src/lib/kadm5/adb.h
+++ b/src/lib/kadm5/adb.h
@@ -12,7 +12,8 @@
 #define __ADB_H__
 #include <sys/types.h>
 #include <gssrpc/types.h>
-#include "k5-int.h"
+#include <errno.h>
+#include <krb5.h>
 #include <krb5/kdb.h>
 #include <db.h>
 #include <kadm5/admin.h>

diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index 4051601ecaa7ff0c7de6c77c304462a79958036c..53d57b33042127ee54bcf8cf12c35652bc73013e 100644 (file)
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -40,7 +40,7 @@
 #include       <sys/types.h>
 #include       <gssrpc/rpc.h>
 #include       <krb5.h>
-#include       <k5-int.h>
+#include       <kdb.h>
 #include       <com_err.h>
 #include       <kadm5/kadm_err.h>
 #include       <kadm5/adb_err.h>

diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index fc2dfca2e3ed87c1d64a93abfe87184343aa18fe..0091dc5ff9fd2c0cfc80407a6a4a4198be789fe9 100644 (file)
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * client_principal.c, clnt_policy.c: Include errno.h.
+       * client_init.c: Include k5-int.h before krb5.h.
+       * err_handle.h: Include com_err.h and krb5.h instead of k5-int.h.
+
 2005-02-11  Tom Yu  <tlyu@mit.edu>
 
        * client_init.c (kadm5_get_init_creds, kadm5_gic_iter) 

diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index f1031548f14604b3ac76c4654675ce192efa766d..9247fa29053b690caccd00ad1a0e4e829821471f 100644 (file)
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -38,8 +38,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <krb5.h>
 #include <k5-int.h> /* for KRB5_ADM_DEFAULT_PORT */
+#include <krb5.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #endif

diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c
index 972a7b3219e411a828ad7be5618a901146997d58..6d7ecc63c4e58733e63fb8f74c5d36cddde2504a 100644 (file)
--- a/src/lib/kadm5/clnt/client_principal.c
+++ b/src/lib/kadm5/clnt/client_principal.c
@@ -14,6 +14,7 @@ static char *rcsid = "$Header$";
 #ifdef HAVE_MEMORY_H
 #include    <memory.h>
 #endif
+#include    <errno.h>
 #include    "client_internal.h"
 
 #ifdef DEBUG

diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c
index 182b2d9e721dea339003640e05d44a01f7f559c5..3d34ad127eb67f9c4351b7565874bf21c76c6169 100644 (file)
--- a/src/lib/kadm5/clnt/clnt_policy.c
+++ b/src/lib/kadm5/clnt/clnt_policy.c
@@ -14,6 +14,7 @@ static char *rcsid = "$Header$";
 #include    "client_internal.h"
 #include       <stdlib.h>
 #include       <string.h>
+#include       <errno.h>
 
 kadm5_ret_t
 kadm5_create_policy(void *server_handle,

diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index f5a34e925b997006f6cf5f5d3f2097e850234945..2ac7c451b93b576e6b192fc7c71e71d39d25fbdb 100644 (file)
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -4,7 +4,7 @@
 
 #include <gssrpc/rpc.h>
 #include <krb5.h>
-#include <k5-int.h>
+#include <errno.h>
 #include <kadm5/admin.h>
 #include <kadm5/kadm_rpc.h>
 #include <kadm5/admin_xdr.h>

diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h
index 7792d0a49b4e53f9826d4ccc9ef1fab4fcf2a6e2..05469777c6b59e3515d266b85607623c9a966676 100644 (file)
--- a/src/lib/kadm5/server_internal.h
+++ b/src/lib/kadm5/server_internal.h
@@ -17,7 +17,7 @@
 #include    <memory.h>
 #endif
 #include    <stdlib.h>
-#include    "k5-int.h"
+#include    <errno.h>
 #include    <krb5/kdb.h>
 #include    <kadm5/admin.h>
 #include    "admin_internal.h"

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index ac4be628d8478dcd34f849b631329dc510419503..25c27f521af255119276fb6d24a66b28ab5df681 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-28  Tom Yu  <tlyu@mit.edu>
+
+       * adb_openclose.c: Include k5-int.h.
+
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * server_init.c, svr_policy.c: Include errno.h.
+
 2005-09-27  Tom Yu  <tlyu@mit.edu>
 
        * svr_iters.c (glob_to_regexp): Increment pointer, not character,

diff --git a/src/lib/kadm5/srv/adb_openclose.c b/src/lib/kadm5/srv/adb_openclose.c
index 7bb671e9c057a71fc62c85662b1ce7814075f1f1..c408abf521345cedd4c287ddc4657682ab7a57cb 100644 (file)
--- a/src/lib/kadm5/srv/adb_openclose.c
+++ b/src/lib/kadm5/srv/adb_openclose.c
@@ -11,6 +11,7 @@ static char *rcsid = "$Header$";
 #include       <sys/file.h>
 #include       <fcntl.h>
 #include       <unistd.h>
+#include       "k5-int.h"
 #include       "adb.h"
 #include       <stdlib.h>
 

diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index dc3526a72ff2fe993c6fc766ad4ad1e3067e93e2..2a3903df718e464ff0849d271ba3be75103cca3a 100644 (file)
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -11,6 +11,7 @@ static char *rcsid = "$Header$";
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <k5-int.h>
 #include <com_err.h>
 #include <kadm5/admin.h>
 #include <krb5.h>

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 7dc2d8f6bc3d507d62062b0772a2e13240991639..151a38baa602fe4565959900032dcf46384f2962 100644 (file)
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -10,9 +10,9 @@ static char *rcsid = "$Header$";
 
 #include       <sys/types.h>
 #include       <sys/time.h>
+#include       <errno.h>
 #include       <kadm5/admin.h>
 #include       "adb.h"
-#include       "k5-int.h"
 #include       <krb5/kdb.h>
 #include       <stdio.h>
 #include       <string.h>

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 4b0777e89dc5767815d56a74405584f55b3f90a6..31de471a67febfe42fa15c28c91e2167f0ff457f 100644 (file)
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * setkey-test.c: Include k5-int.h instead of krb5.h.
+
 2005-02-10  Tom Yu  <tlyu@mit.edu>
 
        * api.2/init-v2.exp: Handle improved error codes from

diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c
index 5b791d8f3fc8c36aaad48c51f35902a8b6f67c51..f82b8b6b0b4a3b01b8c83e608018ab93fc0eca6d 100644 (file)
--- a/src/lib/kadm5/unit-test/setkey-test.c
+++ b/src/lib/kadm5/unit-test/setkey-test.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <krb5.h>
+#include <k5-int.h>
 #include <kadm5/admin.h>
 
 #if    HAVE_SRAND48

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index e1fc665433d407f44e750d453bfe4aa47938e684..0c89b22866c67c665edae0a6a64b58ad1b876294 100644 (file)
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Jeffrey Altman <jaltman@mit.edu>
+
+       * krb5_libinit.c: include k5-int.h instead of krb5.h
+
 2005-02-08  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (LIBINITFUNC, LIBFINIFUNC): Define.

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index f7459c0501ad48c6fd89670b6156e9bc6514f194..821b2a0a518b31cb31dc8a627fc8410aac2780e6 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Jeffrey Altman <jaltman@mit.edu>
+
+       * krb5_decode.c, krb5_encode.c: include k5-int.h instead of krb5.h
+
 2005-10-03  Tom Yu  <tlyu@mit.edu>
 
        * asn1_get.c (asn1_get_tag_2): Patch from Zhihong Zhang to properly

diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c
index 7457c0095d6002eead1c1e77d8736a4100f5c380..04097b0d14cf560418cfd2943a57608acdea923c 100644 (file)
--- a/src/lib/krb5/asn.1/krb5_decode.c
+++ b/src/lib/krb5/asn.1/krb5_decode.c
@@ -24,7 +24,7 @@
  * or implied warranty.
  */
 
-#include "krb5.h"
+#include "k5-int.h"
 #include "krbasn1.h"
 #include "asn1_k_decode.h"
 #include "asn1_decode.h"

diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c
index ecdfa18787a3a883de1089337a1cc8f31ae88796..639db4347a50c13379662505528f4c8fc0cf52b4 100644 (file)
--- a/src/lib/krb5/asn.1/krb5_encode.c
+++ b/src/lib/krb5/asn.1/krb5_encode.c
@@ -24,7 +24,7 @@
  * or implied warranty.
  */
 
-#include "krb5.h"
+#include "k5-int.h"
 #include "asn1_k_encode.h"
 #include "asn1_encode.h"
 #include "krbasn1.h"

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index e7d80c22a09ecc1723cf76270dcfd614b9fa4f2e..099326d7e7ed6b6ebf28da21c2b1d00149c3492e 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Jeffrey Altman <jaltman@mit.edu>
+
+       * winccld.c, stdcc.c: include k5-int.h before stdcc.h
+
 2004-06-22  Ken Raeburn  <raeburn@mit.edu>
 
        * stdcc_util.c (dupK5toCC): Don't test macintosh.

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index 6bad56a3d50e8f3971c9cdfc47b4dbde493ee8dc..c66409dac83c9e19dc8d97f7e6fb118bbbafc7f8 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -29,10 +29,10 @@
  */
 
 #define NEED_WINDOWS
+#include "k5-int.h"
 #include "stdcc.h"
 #include "stdcc_util.h"
 #include "string.h"
-#include "k5-int.h"
 #include <stdio.h>
 
 apiCB *gCntrlBlock = NULL;

diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c
index 71c2c9412c5697335f542f7b4c57a7dc64bc4da2..ac3a8e4781a662b2a9e7d85080b5990e3adeb15c 100644 (file)
--- a/src/lib/krb5/ccache/ccapi/winccld.c
+++ b/src/lib/krb5/ccache/ccapi/winccld.c
@@ -6,8 +6,8 @@
 
 #include <windows.h>
 #include <stdio.h>
-#include "stdcc.h"
 #include "k5-int.h"
+#include "stdcc.h"
 
 /* from fcc-proto.h */
 extern const krb5_cc_ops krb5_fcc_ops;

diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c
index ece79cfc72900bee3458eb4adb4de41dd09399ce..1513aca006d25ad118442ac140fcc94954f21f58 100644 (file)
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -2,7 +2,7 @@
 
 #include "autoconf.h"
 #include "com_err.h"
-#include "krb5.h"
+#include "k5-int.h"
 #include "krb5_err.h"
 #include "kv5m_err.h"
 #include "asn1_err.h"

diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 597ce15e6641b801dd6dc9bc8c49fbc3230c18de..daeeaac3c3136fcce512825a392f0f35e34a8f04 100644 (file)
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-14  Jeffrey Altman <jaltman@mit.edu>
+
+       * rc_io.c: include k5-int.h instead of krb5.h
+
 2005-01-15  Jeffrey Altman <jaltman@mit.edu>
 
         * rc_dfl.c: Move the extraction of the struct dfl_data

diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index a45b6436068134a05120f0281e61c68ab5f7bb44..01c5fd8a417375998242da2df140ff378f79dc14 100644 (file)
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -21,7 +21,7 @@
 #define NEED_SOCKETS
 #define NEED_LOWLEVEL_IO
 
-#include "krb5.h"
+#include "k5-int.h"
 #include <stdio.h> /* for P_tmpdir */
 #include "rc_base.h"
 #include "rc_dfl.h"

diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 5eab7a8996a2e855a2ca6b6e0f4ed27067a8d5f9..05d83c30b297dd8f664eedfa0a4f888bf03840ae 100644 (file)
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Ken Raeburn  <raeburn@mit.edu>
+
+       * utility.h: Don't include krb5.h.
+       * utility.c: Include utility.h before krb5.h.
+
 2004-04-29  Ken Raeburn  <raeburn@mit.edu>
 
        * debug.h (test): Macro renamed from "assert".

diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c
index 526cdce2d3d5d0f464b1fe4a1dc3c84bc0715a27..660161fa19b3a7d25d12ba64e3419da8544e309f 100644 (file)
--- a/src/tests/asn.1/utility.c
+++ b/src/tests/asn.1/utility.c
@@ -1,5 +1,5 @@
-#include "krb5.h"
 #include "utility.h"
+#include "krb5.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>

diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h
index fa79258e549bf4d8f875ff899cf8b11f087d1eb6..4c761244f292f0387117db92cc198c018f11d752 100644 (file)
--- a/src/tests/asn.1/utility.h
+++ b/src/tests/asn.1/utility.h
@@ -1,7 +1,6 @@
 #ifndef __UTILITY_H__
 #define __UTILITY_H__
 
-#include "krb5.h"
 #include "krbasn1.h"
 #include "asn1buf.h"