From 852b8d4be02283bb44b5c8ff676a81fd0014c17a Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Fri, 18 Nov 2005 01:22:06 +0000
Subject: 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
---
 src/kadmin/testing/util/ChangeLog        | 4 ++++
 src/kadmin/testing/util/tcl_kadm5.c      | 1 -
 src/kadmin/testing/util/tcl_ovsec_kadm.c | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/kadmin/testing/util')

diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 6101c09c73..ad3aff92ca 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 828f207a67..3907efdf0b 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 9aaa850237..68eb3f7f85 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"
-- 
cgit