diff options
28 files changed, 62 insertions, 15 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 2cb7b03..8c2cda9 100644 --- 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-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index b4a0ee7..7af39a6 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -26,9 +26,9 @@ */ #include <krb5.h> -#include <k5-int.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 49fdc20..77034fe 100644 --- 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 6101c09..ad3aff9 100644 --- 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-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (KDB_DEP_LIB): Use THREAD_LINKOPTS instead of diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c index 828f207..3907efd 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 <kadm5/admin.h> #include <com_err.h> -#include <k5-int.h> #include <errno.h> #include <stdlib.h> #include <adb_err.h> diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c index 9aaa850..68eb3f7 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 <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/krb524/ChangeLog b/src/krb524/ChangeLog index a8644ed..9bf6ff1 100644 --- 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. + 2005-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index f126641..7572af4 100644 --- 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/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 0f91096..15bdaca 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,9 @@ +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. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index a70e90b..3ce01c7 100644 --- 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/chpass_util_strings.h> diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index c3c2057..4242727 100644 --- 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-10-13 Ken Raeburn <raeburn@mit.edu> * libkadm5clnt.exports: Don't export internal error-table diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c index 248d3a3..a4e3136 100644 --- 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 9816dd9..735d2bf 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 <memory.h> #endif +#include <errno.h> #include "client_internal.h" #include "err_handle.h" diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c index f9fdee4..b1157d1 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 <stdlib.h> #include <string.h> +#include <errno.h> #include "err_handle.h" kadm5_ret_t diff --git a/src/lib/kadm5/clnt/err_handle.h b/src/lib/kadm5/clnt/err_handle.h index 4215e14..7dea7b6 100644 --- a/src/lib/kadm5/clnt/err_handle.h +++ b/src/lib/kadm5/clnt/err_handle.h @@ -9,7 +9,8 @@ **********************************************************************/ #ifndef _idc_sec_1_err_handle_h_H #define _idc_sec_1_err_handle_h_H -#include <k5-int.h> +#include <com_err.h> +#include <krb5.h> /* Everything else goes here */ diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c index f7090bd..346a36e 100644 --- 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 33d6593..cf4755b 100644 --- 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" @@ -39,7 +39,8 @@ typedef struct _osa_pw_hist_t { int n_key_data; krb5_key_data *key_data; } osa_pw_hist_ent, *osa_pw_hist_t; - typedef struct _osa_princ_ent_t { + +typedef struct _osa_princ_ent_t { int version; char *policy; long aux_attributes; diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 4d6fdfd..39fb06e 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn <raeburn@mit.edu> + + * server_init.c, svr_policy.c: Include errno.h. + 2005-10-13 Ken Raeburn <raeburn@mit.edu> * libkadm5srv.exports: Don't export internal error-table symbols, diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c index a536929..dd1fe66 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 <stdio.h> #include <stdlib.h> +#include <errno.h> #include <com_err.h> #include <kadm5/admin.h> #include <krb5.h> diff --git a/src/lib/kadm5/srv/svr_policy.c b/src/lib/kadm5/srv/svr_policy.c index 24398c1..31333b7 100644 --- a/src/lib/kadm5/srv/svr_policy.c +++ b/src/lib/kadm5/srv/svr_policy.c @@ -12,6 +12,7 @@ static char *rcsid = "$Header$"; #include <kadm5/admin.h> #include "server_internal.h" #include <stdlib.h> +#include <errno.h> #define MAX_PW_HISTORY 10 #define MIN_PW_HISTORY 1 diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 85b0d76..6cecbb5 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -10,8 +10,8 @@ static char *rcsid = "$Header$"; #include <sys/types.h> #include <sys/time.h> +#include <errno.h> #include <kadm5/admin.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 06f366f..f3bbd0a 100644 --- 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-10-13 Ken Raeburn <raeburn@mit.edu> * lock-test.c (main): Don't call error table initialization diff --git a/src/lib/kadm5/unit-test/setkey-test.c b/src/lib/kadm5/unit-test/setkey-test.c index af78114..eafa039 100644 --- 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/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog index 22537d4..0e83bcb 100644 --- a/src/modules/kdb/db2/ChangeLog +++ b/src/modules/kdb/db2/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Ken Raeburn <raeburn@mit.edu> + + * policy_db.h: Include errno.h and krb5.h instead of k5-int.h. + 2005-10-27 Ken Raeburn <raeburn@mit.edu> * configure.in: Set build_dynobj=yes. diff --git a/src/modules/kdb/db2/policy_db.h b/src/modules/kdb/db2/policy_db.h index 772b24d..c3c16b9 100644 --- a/src/modules/kdb/db2/policy_db.h +++ b/src/modules/kdb/db2/policy_db.h @@ -11,7 +11,8 @@ #ifndef __ADB_H__ #define __ADB_H__ #include <sys/types.h> -#include "k5-int.h" +#include <errno.h> +#include <krb5.h> #include <krb5/kdb.h> #include <db.h> #include <gssrpc/types.h> diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog index cdf67b4..dbe7c3b 100644 --- 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. + 2005-06-01 Ken Raeburn <raeburn@mit.edu> * trval.c (convert_nibble): Declare the argument with a type. diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c index 526cdce..660161f 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 <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 fa79258..4c76124 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" |