From 20e560a3387a012658145351b99fb14cf3c52506 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Fri, 12 Dec 1997 04:28:29 +0000
Subject: [PATCH] 	* ftpd.c: Don't include netdb.h or sys/socket.h if
 krb.h is 	included; this works around an Ultrix bug where those headers 
 aren't protected against multiple inclusion.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10333 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/appl/gssftp/ftpd/ChangeLog | 6 ++++++
 src/appl/gssftp/ftpd/ftpd.c    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 4deb143e0..6725f1e1a 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 11 23:28:07 1997  Tom Yu  <tlyu@mit.edu>
+
+	* ftpd.c: Don't include netdb.h or sys/socket.h if krb.h is
+	included; this works around an Ultrix bug where those headers
+	aren't protected against multiple inclusion.
+
 Thu Oct 16 01:23:41 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in: Change LOCALINCLUDE and the link line to allow for
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 8eed259bb..318d2da4f 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -47,7 +47,10 @@ static char sccsid[] = "@(#)ftpd.c	5.40 (Berkeley) 7/2/91";
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#ifndef KRB5_KRB4_COMPAT
+/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */
 #include <sys/socket.h>
+#endif
 #include <sys/wait.h>
 #include <sys/file.h>
 
@@ -69,7 +72,10 @@ static char sccsid[] = "@(#)ftpd.c	5.40 (Berkeley) 7/2/91";
 #include <shadow.h>
 #endif
 #include <setjmp.h>
+#ifndef KRB5_KRB4_COMPAT
+/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */
 #include <netdb.h>
+#endif
 #include <errno.h>
 #include <syslog.h>
 #include <unistd.h>
-- 
2.26.2