diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-11-18 01:22:06 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-11-18 01:22:06 +0000 |
| commit | 852b8d4be02283bb44b5c8ff676a81fd0014c17a (patch) | |
| tree | c4def5f90a2e3484f259e478aa2bfc40206d3539 /src/kadmin | |
| parent | f308ff31e9ebc703d8aa79c0c4228f5752ced5db (diff) | |
| download | krb5-852b8d4be02283bb44b5c8ff676a81fd0014c17a.tar.gz krb5-852b8d4be02283bb44b5c8ff676a81fd0014c17a.tar.xz krb5-852b8d4be02283bb44b5c8ff676a81fd0014c17a.zip | |
Fix additional cases where krb5.h is included before k5-int.h. In most cases,
it suffices to remove the inclusion of k5-int.h, sometimes including errno.h or
another header. In a couple cases, include order has been changed, or k5-int.h
has been included instead of krb5.h.
ticket: 3236
status: resolved
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17494 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 2 | ||||
| -rw-r--r-- | src/kadmin/cli/keytab.c | 1 | ||||
| -rw-r--r-- | src/kadmin/testing/util/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_kadm5.c | 1 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_ovsec_kadm.c | 1 |
6 files changed, 11 insertions, 3 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 2cb7b032c..8c2cda9fc 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 b4a0ee708..7af39a661 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 49fdc20b8..77034fedd 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 6101c09c7..ad3aff92c 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 828f207a6..3907efdf0 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 9aaa85023..68eb3f7f8 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" |