From: John Gilmore <gnu@toad.com>
Date: Tue, 28 Feb 1995 09:54:42 +0000 (+0000)
Subject: Avoid <krb5/...> includes
X-Git-Tag: krb5-1.0-beta5~646
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81e578f8acdbe3e140f93d377b2d2d5d06ca2724;p=krb5.git

Avoid <krb5/...> includes

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5024 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 37897726e..565ee8f21 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,6 +1,10 @@
+Tue Feb 28 01:52:34 1995  John Gilmore  (gnu at toad.com)
+
+	* poplib.c:  Avoid <krb5/...> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
-	* poplib.c (pop_init): Call krb5_sendauth() with new calling convention.
+	* poplib.c (pop_init): Call krb5_sendauth() with new calling convention
 
 Fri Jan 13 15:23:47 1995  Chris Provenzano (proven@mit.edu)
 
diff --git a/src/appl/mailquery/poplib.c b/src/appl/mailquery/poplib.c
index 35518d1e0..ea3f5bcb9 100644
--- a/src/appl/mailquery/poplib.c
+++ b/src/appl/mailquery/poplib.c
@@ -37,10 +37,8 @@ error You cannot define both KRB4 and KRB5
 #include <krb.h>
 #endif
 #ifdef KRB5
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
-#include <krb5/los-proto.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include <ctype.h>
 #endif
 #endif
diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
index 8b9fd96c8..88a786728 100644
--- a/src/appl/movemail/ChangeLog
+++ b/src/appl/movemail/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:53:27 1995  John Gilmore  (gnu at toad.com)
+
+	* movemail.c:  Avoid <krb5/...> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * movemail.c Call krb5_sendauth() with new calling convention.
diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c
index 65d55daba..89d6ac2b7 100644
--- a/src/appl/movemail/movemail.c
+++ b/src/appl/movemail/movemail.c
@@ -65,8 +65,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifdef KRB5
 /* these need to be here to declare the functions which are used by
    non-kerberos specific code */
-#include <krb5/krb5.h>
-#include <krb5/ext-proto.h>
+#include "krb5.h"
 #endif
 #endif
 #ifdef USG
@@ -353,8 +352,8 @@ xmalloc (size)
 #include <des.h>
 #endif /* KRB4 */
 #ifdef KRB5
-#include <krb5/los-proto.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include <ctype.h>
 #endif /* KRB5 */
 #endif /* KERBEROS */
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 9d43f9038..6af8ace0e 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 28 01:50:22 1995  John Gilmore  (gnu at toad.com)
+
+	* sys_term.c:  Avoid <krb5/...> includes.
+
 Wed Jan 11 15:23:07 1995  Mark Eichin  <eichin@cygnus.com>
 
 	* configure.in (K4LIB): fix quoting so $(KRB4) actually survives
diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 8142b7152..7fa67ff48 100644
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -45,7 +45,7 @@
 #endif
 
 #if	defined(KRB5)
-#include <krb5/osconf.h>
+#include "k5-int.h"
 #endif
 
 #if defined(CRAY) || defined(__hpux)