From d43f941d130bc6a12ad4e5deb2041c472f37be7e Mon Sep 17 00:00:00 2001
From: John Gilmore <gnu@toad.com>
Date: Tue, 28 Feb 1995 09:43:29 +0000
Subject: [PATCH] * forward.c, kcmd.c, krcp.c, krlogin.c, krlogind.c, krsh.c,
 krshd.c:  Avoid <krb5/...> and <com_err.h> includes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5020 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/bsd/ChangeLog  | 5 +++++
 src/appl/bsd/forward.c  | 5 +----
 src/appl/bsd/kcmd.c     | 4 +---
 src/appl/bsd/krcp.c     | 8 ++------
 src/appl/bsd/krlogin.c  | 7 ++-----
 src/appl/bsd/krlogind.c | 8 ++------
 src/appl/bsd/krsh.c     | 7 ++-----
 src/appl/bsd/krshd.c    | 8 ++------
 8 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index da0ffca47..230b9a2dd 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 28 01:41:04 1995  John Gilmore  (gnu at toad.com)
+
+	* forward.c, kcmd.c, krcp.c, krlogin.c, krlogind.c, krsh.c,
+	krshd.c:  Avoid <krb5/...> and <com_err.h> includes.
+
 Tue Feb 14 15:30:55 1995 Chris Provenzano  (proven@mit.edu)
 
         * kcmd.c Call krb5_sendauth() and krb5_get_credentials() with 
diff --git a/src/appl/bsd/forward.c b/src/appl/bsd/forward.c
index be26bb215..9c9b229be 100644
--- a/src/appl/bsd/forward.c
+++ b/src/appl/bsd/forward.c
@@ -27,10 +27,7 @@
 #include <pwd.h>
 #include <netdb.h>
 
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/los-proto.h>
-#include <krb5/ext-proto.h>
+#include "krb5.h"
 
 /* Decode, decrypt and store the forwarded creds in the local ccache. */
 krb5_error_code
diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index faa1e8afa..653f40203 100644
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -50,9 +50,7 @@
 #include <netdb.h>
      
 #include <errno.h>
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/ext-proto.h>
+#include "krb5.h"
 
 #include "defines.h"
      
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index a914f6599..cdc7ffd4b 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -64,12 +64,8 @@ char copyright[] =
 #endif
 
 #ifdef KERBEROS
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/mit-des.h>
-#include <krb5/los-proto.h>
-
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
      
 #ifdef BUFSIZ
 #undef BUFSIZ
diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index f98f37d5f..2fe1662e7 100644
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -127,11 +127,8 @@ char copyright[] =
 #endif
 
 #ifdef KERBEROS
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/mit-des.h>
-#include <krb5/los-proto.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include "defines.h"
      
 #ifdef BUFSIZ
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index a95869145..71e4753f4 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -207,11 +207,7 @@ struct winsize {
 
 #ifdef KERBEROS
      
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
-#include <krb5/asn1.h>
-#include <krb5/mit-des.h>
-#include <krb5/los-proto.h>
+#include "krb5.h"
 #include <kerberosIV/krb.h>
 
 #ifdef BUFSIZ
@@ -234,7 +230,7 @@ int v4_des_read(), v4_des_write();
 
 int v5_des_read(), v5_des_write();
 
-#include <com_err.h>
+#include "com_err.h"
      
 #define SECURE_MESSAGE  "This rlogin session is using DES encryption for all data transmissions.\r\n"
 
diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c
index 17e3a6f71..8ed1e0dd3 100644
--- a/src/appl/bsd/krsh.c
+++ b/src/appl/bsd/krsh.c
@@ -55,11 +55,8 @@ char copyright[] =
 #endif
 
 #ifdef KERBEROS
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/mit-des.h>
-#include <krb5/osconf.h>
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include "defines.h"
 #endif /* KERBEROS */
      
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 6d4ffde9b..538d9bc0a 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -154,12 +154,8 @@ char copyright[] =
 #endif
 
 #ifdef KERBEROS
-#include <krb5/krb5.h>
-#include <krb5/asn1.h>
-#include <krb5/mit-des.h>
-#include <krb5/ext-proto.h>
-
-#include <com_err.h>
+#include "krb5.h"
+#include "com_err.h"
 #include "loginpaths.h"
 
 #define ARGSTR	"rRxXeEkKD:?"
-- 
2.26.2