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

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 2cb7b032c2c085a8d0df60948e5f6a4fdcc9ffd5..8c2cda9fc45a8f34128ce98b4e99912fa6b62393 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-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 b4a0ee7089ec56cbcf21f24263959a984faf41e6..7af39a661b55bf8543793192d6cc150bd5fb9e68 100644 (file)
--- 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 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 6101c09c73430ef3cc1a59eb2d15c6d44e8c05ee..ad3aff92cac7cbf31da3883855f717356cdaf406 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-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 828f207a677b09e6e561e136420dacb9ac6bf2c2..3907efdf0b242e9590ed5eaff54491e625d5d0b4 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 <adb_err.h>

diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index 9aaa850237ec607e0eb29fb5ea6e964949e5095f..68eb3f7f85737af3e52ee9c0b9373744305b6bee 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/krb524/ChangeLog b/src/krb524/ChangeLog
index a8644ed903aa90eaac81e406aa33bc43c591396d..9bf6ff104b32410d5db2b76340f30d5a587d2d7f 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.
+
 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 f126641b4a93bbbca0b8924c472d03ac1413692a..7572af41908620c8ea1546b865cfffd68052cee5 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/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 0f910962b2bd4f24d714069b12d87b84151ec24c..15bdaca53c75862a024d37426092ee8b17502a5d 100644 (file)
--- 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 a70e90b4eb050dc79bf75cdf24f939abde316e47..3ce01c7f3d4c6b62c6acb8b41ccaec3faf67e07f 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/chpass_util_strings.h>

diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index c3c2057a38ed864b5e116e739ca70e81e7f970d8..4242727725ef383d33dc8da8ec82124e8e96900e 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-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 248d3a3cec311dc85725a6bebc43f2ea388aaa01..a4e31362820e78ce736156b0dfbeb7db0044add2 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 9816dd971892208af892b62b3a2008c51e3d2d29..735d2bfc98122d9a24c35803c0e8bf9d4a15dba5 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"
 #include    "err_handle.h"
 

diff --git a/src/lib/kadm5/clnt/clnt_policy.c b/src/lib/kadm5/clnt/clnt_policy.c
index f9fdee40ac0a7eb3cff6418f6b3ff8f1717a1b39..b1157d1e719e0a90b5eba6ee7afdb017b1fdcbd0 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>
 #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 4215e1496f8443942df73cc5336c450d53547f19..7dea7b6083904f5c61c1a32b54ed64224fd61065 100644 (file)
--- 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 f7090bdcf7d825bb931ce93ed2e135632045b84c..346a36ea933123acf81711cef92b4be13cdfc071 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 33d6593ac0b3dbc9f0d4bfb597c6daeb7aede0bf..cf4755b6dfd7870d098f903f73cce592b2fe3853 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"
@@ -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 4d6fdfd4563170928cfe8882262ad65ff1981274..39fb06e3aefae7301a3b68a45ac1f75ed7723517 100644 (file)
--- 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 a5369298ac1d955a84a7aa02a06717197f346a7b..dd1fe66930a8f8464c7b301e07d0b31474217a91 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 <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 24398c1f4e10f6c0589be3fc0157d506e3bf7bcf..31333b73c2103ecd62782a703130b79778c704d0 100644 (file)
--- 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 85b0d76e562605058b96f059e359bd34fded6a1a..6cecbb5d24ff5eb221809f11bedfc5b16225d788 100644 (file)
--- 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 06f366fc21de1e669afb48f0530648191d0f67b7..f3bbd0afe62755e7b9e9bae5801968cb497fd27c 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-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 af78114de5e82b7ff37d1eef03ccf5b9e8297f62..eafa039e5613442a5172ad734cb0f25bca53a784 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/modules/kdb/db2/ChangeLog b/src/modules/kdb/db2/ChangeLog
index 22537d4eb683e084d9e142ba635551e90ed3ccb9..0e83bcb901b33640e1cab8a64224ed8b2908c090 100644 (file)
--- 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 772b24d0762d4b169b5112f1088e595a2be8d86a..c3c16b9afc77f382eeb9e0b048c7be61bf7f4b7e 100644 (file)
--- 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 cdf67b469ae5009c63486a0030940d6a15ea17af..dbe7c3ba69d9886719b7f9431f47b60ccebf1576 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.
+
 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 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"