summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-01-10 02:51:06 +0000
committerTheodore Tso <tytso@mit.edu>1995-01-10 02:51:06 +0000
commit1db83e5afae10b8c37e2120ed65eecc8d83a955f (patch)
tree9afe74bb76e219193580c9b383f66e4d88150bdc /src
parent03a268f6c772f5ffddc877f5fea45831e41ef067 (diff)
downloadkrb5-1db83e5afae10b8c37e2120ed65eecc8d83a955f.tar.gz
krb5-1db83e5afae10b8c37e2120ed65eecc8d83a955f.tar.xz
krb5-1db83e5afae10b8c37e2120ed65eecc8d83a955f.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/appl/bsd/ChangeLog7
-rw-r--r--src/appl/bsd/kcmd.c5
-rw-r--r--src/appl/bsd/krcp.c4
-rw-r--r--src/appl/bsd/krlogin.c3
-rw-r--r--src/appl/bsd/krshd.c2
5 files changed, 8 insertions, 13 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7ee21c962..8144c4b12 100644
--- 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 2f4fabd08..31c448d45 100644
--- 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 e2adb920e..5101d5f72 100644
--- 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 86b416f27..d48e98133 100644
--- 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 f1dd3a274..5cad08f8a 100644
--- 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 */