* kcmd.c, krlogin.c, krcp.c: Always include fcntl.h, and never

		sys/fcntl.h.

	* krshd.c: Always define the Kerberos V4 data structures.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7ee21c9627e0fd31cebe1e1d794eb4dcb055932f..8144c4b12464dfc99b8490e96efb3038a2c9a759 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan  9 21:48:54 1995  Theodore Y. Ts'o  (tytso@dcl)
+    
+       * kcmd.c, krlogin.c, krcp.c: Always include fcntl.h, and never
+               sys/fcntl.h.
+
+       * krshd.c: Always define the Kerberos V4 data structures.
+
 Tue Jan  3 16:54:02 1995  Richard Basch  (probe@tardis)
 
        * krshd.c

diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index 2f4fabd0890fe1a9e9a0a784fe439f15fdb7b9ea..31c448d45b953c39e8da504e9db5a3ccaaf98e90 100644 (file)
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -31,11 +31,6 @@
 #define _TYPES_
 #endif
 #include <fcntl.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-
-     
      
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 1024

diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index e2adb920eaae59ef95a64d30342bebe78ee1541d..5101d5f7266ffd120ab7b32a151ea4afb46b663d 100644 (file)
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -36,9 +36,7 @@ char copyright[] =
 #define _TYPES_
 #endif
 #include <sys/file.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>

diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c
index 86b416f27f9222403cadb0c8f1a942fc3e51e1c7..d48e98133a43c9264c4585a9085dd66c942141ab 100644 (file)
--- a/src/appl/bsd/krlogin.c
+++ b/src/appl/bsd/krlogin.c
@@ -50,9 +50,6 @@ char copyright[] =
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <fcntl.h>
-#ifdef NEED_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
 
 #include <netinet/in.h>
 

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index f1dd3a274db74b30098bcfb96052e14d6c8c2d54..5cad08f8a722017a75f0f974f929d89f7916b609 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -446,11 +446,9 @@ char *kremuser;
 krb5_principal client;
 krb5_authenticator *kdata;
 
-#ifdef KRB5_KRB4_COMPAT
 #include <kerberosIV/krb.h>
 AUTH_DAT       *v4_kdata;
 KTEXT          v4_ticket;
-#endif
 
 int auth_sys = 0;      /* Which version of Kerberos used to authenticate */