From 16d7c918f1e3278b5ac2ee8bef8457dec9e654bd Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 29 Nov 2005 00:01:49 +0000 Subject: [PATCH] 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 --- src/kadmin/cli/ChangeLog | 5 +++++ src/kadmin/cli/kadmin.c | 1 + src/kadmin/cli/keytab.c | 1 + src/kadmin/testing/util/ChangeLog | 4 ++++ src/kadmin/testing/util/tcl_kadm5.c | 1 - src/kadmin/testing/util/tcl_ovsec_kadm.c | 1 - src/kdc/ChangeLog | 4 ++++ src/kdc/fakeka.c | 1 + src/krb524/ChangeLog | 4 ++++ src/krb524/krb524d.c | 2 +- src/lib/crypto/ChangeLog | 4 ++++ src/lib/crypto/t_hmac.c | 1 - src/lib/crypto/t_pkcs5.c | 1 - src/lib/gssapi/krb5/ChangeLog | 4 ++++ src/lib/gssapi/krb5/gssapiP_krb5.h | 2 +- src/lib/kadm5/ChangeLog | 10 ++++++++++ src/lib/kadm5/adb.h | 3 ++- src/lib/kadm5/admin.h | 2 +- src/lib/kadm5/clnt/ChangeLog | 6 ++++++ src/lib/kadm5/clnt/client_init.c | 2 +- src/lib/kadm5/clnt/client_principal.c | 1 + src/lib/kadm5/clnt/clnt_policy.c | 1 + src/lib/kadm5/kadm_rpc_xdr.c | 2 +- src/lib/kadm5/server_internal.h | 2 +- src/lib/kadm5/srv/ChangeLog | 8 ++++++++ src/lib/kadm5/srv/adb_openclose.c | 1 + src/lib/kadm5/srv/server_init.c | 1 + src/lib/kadm5/srv/svr_principal.c | 2 +- src/lib/kadm5/unit-test/ChangeLog | 4 ++++ src/lib/kadm5/unit-test/setkey-test.c | 2 +- src/lib/krb5/ChangeLog | 4 ++++ src/lib/krb5/asn.1/ChangeLog | 4 ++++ src/lib/krb5/asn.1/krb5_decode.c | 2 +- src/lib/krb5/asn.1/krb5_encode.c | 2 +- src/lib/krb5/ccache/ccapi/ChangeLog | 4 ++++ src/lib/krb5/ccache/ccapi/stdcc.c | 2 +- src/lib/krb5/ccache/ccapi/winccld.c | 2 +- src/lib/krb5/krb5_libinit.c | 2 +- src/lib/krb5/rcache/ChangeLog | 4 ++++ src/lib/krb5/rcache/rc_io.c | 2 +- src/tests/asn.1/ChangeLog | 5 +++++ src/tests/asn.1/utility.c | 2 +- src/tests/asn.1/utility.h | 1 - 43 files changed, 98 insertions(+), 21 deletions(-) diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 1e2ef44f0..971183523 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Ken Raeburn + + * kadmin.c: Include errno.h instead of k5-int.h. + * keytab.c: Include errno.h. + 2005-02-11 Tom Yu * 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 957659dad..029c75e65 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index 49fdc20b8..77034fedd 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -38,6 +38,7 @@ static char *rcsid = "$Header$"; #include #include #include +#include #include #include diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index f34d8f83c..9bc3f2c19 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn + + * tcl_kadm5.c, tcl_ovsec_kadm.c: Don't include k5-int.h. + 2005-02-10 Tom Yu * 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 a6b945277..af275bdfb 100644 --- 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 #include -#include #include #include #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 e67b84d5c..b4b2f4258 100644 --- 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 #include -#include #include #include #include "tcl_kadm5.h" diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 165f2d072..43456f2d0 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn + + * fakeka.c: Include errno.h. + 2005-10-13 Tom Yu * kdc_preauth.c (etype_info_as_rep_helper): New function; shared diff --git a/src/kdc/fakeka.c b/src/kdc/fakeka.c index 452d8d3d8..08ad43318 100644 --- a/src/kdc/fakeka.c +++ b/src/kdc/fakeka.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #ifdef HAVE_UNISTD_H #include diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 0dea38dd6..ea27fa392 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn + + * krb524d.c: Include k5-int.h instead of krb5.h. + 2004-09-08 Tom Yu * Makefile.in (install-unix): Install krb524d manpage. diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 5b3641bcc..c834d5f93 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -41,7 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include +#include #include #include #include diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index fa03524a3..80f269ea7 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn + + * t_hmac.c, t_pkcs5.c: Don't include krb5.h. + 2005-03-15 Jeffrey Altman * 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 8208edded..000e64b85 100644 --- a/src/lib/crypto/t_hmac.c +++ b/src/lib/crypto/t_hmac.c @@ -33,7 +33,6 @@ #include #include -#include #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 db255280a..fa1f43dea 100644 --- a/src/lib/crypto/t_pkcs5.c +++ b/src/lib/crypto/t_pkcs5.c @@ -31,7 +31,6 @@ #include #include #include -#include #include "k5-int.h" diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index ec6b1341f..0e6c3a471 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman + + * gssapi_krb5.hin: include k5-int.h instead of krb5.h + 2005-10-20 Alexandra Ellwood , Jeffrey Altman * 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 cf78b94b8..7d7599c61 100644 --- 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 +#include #ifdef HAVE_MEMORY_H #include diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 0e0ae8acf..c6fbecf1f 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,13 @@ +2005-11-28 Tom Yu + + * adb.h: Include errno.h and krb5.h instead of k5-int.h. + +2005-11-17 Ken Raeburn + + * 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 * admin.h (KADM5_CONFIG_NO_AUTH): New flag. diff --git a/src/lib/kadm5/adb.h b/src/lib/kadm5/adb.h index 8b53b5501..ce953a0e7 100644 --- a/src/lib/kadm5/adb.h +++ b/src/lib/kadm5/adb.h @@ -12,7 +12,8 @@ #define __ADB_H__ #include #include -#include "k5-int.h" +#include +#include #include #include #include diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index 4051601ec..53d57b330 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index fc2dfca2e..0091dc5ff 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,9 @@ +2005-11-17 Ken Raeburn + + * 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 * 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 f1031548f..9247fa290 100644 --- a/src/lib/kadm5/clnt/client_init.c +++ b/src/lib/kadm5/clnt/client_init.c @@ -38,8 +38,8 @@ #include #include #include -#include #include /* for KRB5_ADM_DEFAULT_PORT */ +#include #ifdef __STDC__ #include #endif diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c index 972a7b321..6d7ecc63c 100644 --- 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 #endif +#include #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 182b2d9e7..3d34ad127 100644 --- 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 #include +#include 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 f5a34e925..2ac7c451b 100644 --- a/src/lib/kadm5/kadm_rpc_xdr.c +++ b/src/lib/kadm5/kadm_rpc_xdr.c @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h index 7792d0a49..05469777c 100644 --- a/src/lib/kadm5/server_internal.h +++ b/src/lib/kadm5/server_internal.h @@ -17,7 +17,7 @@ #include #endif #include -#include "k5-int.h" +#include #include #include #include "admin_internal.h" diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index ac4be628d..25c27f521 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,11 @@ +2005-11-28 Tom Yu + + * adb_openclose.c: Include k5-int.h. + +2005-11-17 Ken Raeburn + + * server_init.c, svr_policy.c: Include errno.h. + 2005-09-27 Tom Yu * 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 7bb671e9c..c408abf52 100644 --- 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 #include #include +#include "k5-int.h" #include "adb.h" #include diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c index dc3526a72..2a3903df7 100644 --- 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 #include +#include #include #include #include diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 7dc2d8f6b..151a38baa 100644 --- 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 #include +#include #include #include "adb.h" -#include "k5-int.h" #include #include #include diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 4b0777e89..31de471a6 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn + + * setkey-test.c: Include k5-int.h instead of krb5.h. + 2005-02-10 Tom Yu * 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 5b791d8f3..f82b8b6b0 100644 --- a/src/lib/kadm5/unit-test/setkey-test.c +++ b/src/lib/kadm5/unit-test/setkey-test.c @@ -1,5 +1,5 @@ #include -#include +#include #include #if HAVE_SRAND48 diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index e1fc66543..0c89b2286 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman + + * krb5_libinit.c: include k5-int.h instead of krb5.h + 2005-02-08 Ken Raeburn * Makefile.in (LIBINITFUNC, LIBFINIFUNC): Define. diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index f7459c050..821b2a0a5 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman + + * krb5_decode.c, krb5_encode.c: include k5-int.h instead of krb5.h + 2005-10-03 Tom Yu * 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 7457c0095..04097b0d1 100644 --- 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 ecdfa1878..639db4347 100644 --- 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 e7d80c22a..099326d7e 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman + + * winccld.c, stdcc.c: include k5-int.h before stdcc.h + 2004-06-22 Ken Raeburn * 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 6bad56a3d..c66409dac 100644 --- 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 apiCB *gCntrlBlock = NULL; diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c index 71c2c9412..ac3a8e478 100644 --- a/src/lib/krb5/ccache/ccapi/winccld.c +++ b/src/lib/krb5/ccache/ccapi/winccld.c @@ -6,8 +6,8 @@ #include #include -#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 ece79cfc7..1513aca00 100644 --- 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 597ce15e6..daeeaac3c 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +2005-11-14 Jeffrey Altman + + * rc_io.c: include k5-int.h instead of krb5.h + 2005-01-15 Jeffrey Altman * 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 a45b64360..01c5fd8a4 100644 --- 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 /* 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 5eab7a899..05d83c30b 100644 --- a/src/tests/asn.1/ChangeLog +++ b/src/tests/asn.1/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Ken Raeburn + + * utility.h: Don't include krb5.h. + * utility.c: Include utility.h before krb5.h. + 2004-04-29 Ken Raeburn * debug.h (test): Macro renamed from "assert". diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c index 526cdce2d..660161fa1 100644 --- 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 #include #include diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h index fa79258e5..4c761244f 100644 --- 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" -- 2.26.2