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/cli/ChangeLog | 5 +++++
 src/kadmin/cli/kadmin.c  | 2 +-
 src/kadmin/cli/keytab.c  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/kadmin/cli')

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 2cb7b032c2..8c2cda9fc4 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 b4a0ee7089..7af39a661b 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 49fdc20b89..77034fedd0 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>
-- 
cgit