From cee79e98488ba138d1ebadb7488df7da54be627b Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 11 Mar 2006 22:23:28 +0000
Subject: Instead of arbitrary division of headers into include and
 include/krb5, with include directives sometimes using krb5/foo.h and
 sometimes using foo.h, and -I options always given for both directories in
 both source and build trees, push include/krb5/* up a level and drop the krb5
 directory (except, for the moment, the change log).

Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17730 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/server/ChangeLog      | 5 +++++
 src/kadmin/server/misc.c         | 2 +-
 src/kadmin/server/ovsec_kadmd.c  | 4 ++--
 src/kadmin/server/schpw.c        | 2 +-
 src/kadmin/server/server_stubs.c | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/kadmin/server')

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index a84ddc8f0..bbfb35760 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-11  Ken Raeburn  <raeburn@mit.edu>
+
+	* ovsec_kadmd.c, schpw.c, server_stubs.c, misc.c: Don't look for
+	headers in krb5/.
+
 2005-10-12  Tom Yu  <tlyu@mit.edu>
 
 	* misc.h, misc.c (schpw_util_wrapper): Rename from
diff --git a/src/kadmin/server/misc.c b/src/kadmin/server/misc.c
index c623e55bd..fa4ca914c 100644
--- a/src/kadmin/server/misc.c
+++ b/src/kadmin/server/misc.c
@@ -4,7 +4,7 @@
  */
 
 #include    <k5-int.h>
-#include    <krb5/kdb.h>
+#include    <kdb.h>
 #include    <kadm5/server_internal.h>
 #include    "misc.h"
 
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 31cc25223..9acb95d1b 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -49,8 +49,8 @@
 #include    <kadm5/admin.h>
 #include    <kadm5/kadm_rpc.h>
 #include    <kadm5/server_acl.h>
-#include    <krb5/adm_proto.h>
-#include    "krb5/kdb_kt.h"	/* for krb5_ktkdb_set_context */
+#include    <adm_proto.h>
+#include    "kdb_kt.h"	/* for krb5_ktkdb_set_context */
 #include    <string.h>
 #include    "kadm5/server_internal.h" /* XXX for kadm5_server_handle_t */
 
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index 8c676c08c..28cf75c2f 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -1,7 +1,7 @@
 #include "k5-int.h"
 #include <kadm5/admin.h>
 #include <syslog.h>
-#include <krb5/adm_proto.h>	/* krb5_klog_syslog */
+#include <adm_proto.h>	/* krb5_klog_syslog */
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c
index e3d6709cf..c26ed697b 100644
--- a/src/kadmin/server/server_stubs.c
+++ b/src/kadmin/server/server_stubs.c
@@ -12,7 +12,7 @@
 #include <kadm5/server_acl.h>
 #include <syslog.h>
 #include <arpa/inet.h>  /* inet_ntoa */
-#include <krb5/adm_proto.h>  /* krb5_klog_syslog */
+#include <adm_proto.h>  /* krb5_klog_syslog */
 #include "misc.h"
 
 #define LOG_UNAUTH  "Unauthorized request: %s, %s, client=%s, service=%s, addr=%s"
-- 
cgit