From 2bc03ada9004c6e85ad6ffee86f5a792de26c235 Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@toad.com>
Date: Tue, 28 Feb 1995 10:22:14 +0000
Subject: [PATCH] Avoid <krb5/...> includes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5029 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin.new/client/ChangeLog    |  4 ++++
 src/kadmin.new/client/kadmin.c     |  5 +----
 src/kadmin.new/client/memmove.c    |  3 +--
 src/kadmin.new/client/ss_wrapper.c |  2 +-
 src/kadmin/kpasswd/ChangeLog       |  4 ++++
 src/kadmin/kpasswd/kpasswd.c       | 19 +++----------------
 6 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/kadmin.new/client/ChangeLog b/src/kadmin.new/client/ChangeLog
index 0303a7693..80748f827 100644
--- a/src/kadmin.new/client/ChangeLog
+++ b/src/kadmin.new/client/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:17:40 1995  John Gilmore  (gnu at toad.com)
+
+	* kadmin.c, memmove.c, ss_wrapper.c:  Avoid <krb5/...> includes.
+
 Thu Dec 22 20:55:05 1994  Tom Yu  (tlyu@dragons-lair)
 
 	* kadmin.c: lots of bug fixes, fixing addprinc -randkey, cosmetic
diff --git a/src/kadmin.new/client/kadmin.c b/src/kadmin.new/client/kadmin.c
index 33c9fce34..e316e785e 100644
--- a/src/kadmin.new/client/kadmin.c
+++ b/src/kadmin.new/client/kadmin.c
@@ -22,10 +22,7 @@
  * the OVSecure library
  */
 
-#include <krb5/krb5.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
-#include <krb5/kdb.h>
+#include "k5-int.h"
 #include <ovsec_admin/admin.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/kadmin.new/client/memmove.c b/src/kadmin.new/client/memmove.c
index abc91e923..183c29498 100644
--- a/src/kadmin.new/client/memmove.c
+++ b/src/kadmin.new/client/memmove.c
@@ -38,8 +38,7 @@
 
 /* based on @(#)bcopy.c	5.11 (Berkeley) 6/21/91 */
 
-#include <krb5/osconf.h>
-#include <krb5/config.h>
+#include "k5-int.h"
 #ifdef USE_STRING_H
 #include <string.h>
 #else
diff --git a/src/kadmin.new/client/ss_wrapper.c b/src/kadmin.new/client/ss_wrapper.c
index 3fa3aa9f8..6dc13147f 100644
--- a/src/kadmin.new/client/ss_wrapper.c
+++ b/src/kadmin.new/client/ss_wrapper.c
@@ -22,7 +22,7 @@
  * ss wrapper for kadmin
  */
 
-#include <krb5/krb5.h>
+#include "krb5.h"
 #include <ss/ss.h>
 #include <stdio.h>
 
diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog
index 7895ab962..d9ceb486f 100644
--- a/src/kadmin/kpasswd/ChangeLog
+++ b/src/kadmin/kpasswd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 02:21:41 1995  John Gilmore  (gnu at toad.com)
+
+	* kpasswd.c:  Avoid <krb5/...> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * kpasswd.c Call krb5_sendauth(), krb5_get_credentials()
diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c
index b5db1028f..3f053d679 100644
--- a/src/kadmin/kpasswd/kpasswd.c
+++ b/src/kadmin/kpasswd/kpasswd.c
@@ -31,29 +31,16 @@
 #include <sys/param.h>
 #include <pwd.h>
 
-#include <krb5/adm_defs.h>
-
 #include <sys/stat.h>
 
-#include <krb5/krb5.h>
+#include "k5-int.h"
+
 #ifdef USE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
-#include <krb5/kdb.h>
-#include <krb5/kdb_dbm.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <krb5/asn1.h>
-#include <krb5/config.h>
-#include <krb5/base-defs.h>
-#include <krb5/asn1.h>
-#include <krb5/adm_err.h>
-#include <krb5/errors.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/krb5_err.h>
-#include <com_err.h>
+#include "com_err.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024
-- 
2.26.2