From: Tom Yu <tlyu@mit.edu>
Date: Fri, 12 Dec 1997 04:27:57 +0000 (+0000)
Subject: 	* ftp.c:
X-Git-Tag: krb5-1.1-beta1~916
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ba3288bba0786ecf0b510f11a7d9028bcb5de95;p=krb5.git

	* ftp.c:
	* main.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@10332 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 64cf0d0ca..34d61bcd2 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 11 23:26:58 1997  Tom Yu  <tlyu@mit.edu>
+
+	* ftp.c:
+	* main.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:20:30 1997  Tom Yu  <tlyu@mit.edu>
 
 	* main.c: Change KERBEROS to KRB5_KRB4_COMPAT where appropriate.
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index 41207c06a..3d2f07a36 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -41,7 +41,10 @@ static char sccsid[] = "@(#)ftp.c	5.38 (Berkeley) 4/22/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/time.h>
 #include <sys/file.h>
 #ifdef HAVE_SYS_SELECT_H
@@ -58,7 +61,10 @@ static char sccsid[] = "@(#)ftp.c	5.38 (Berkeley) 4/22/91";
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
+#ifndef KRB5_KRB4_COMPAT
+/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */
 #include <netdb.h>
+#endif
 #include <fcntl.h>
 #include <pwd.h>
 #ifndef STDARG
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c
index a73f4fb93..6c6cfc5f1 100644
--- a/src/appl/gssftp/ftp/main.c
+++ b/src/appl/gssftp/ftp/main.c
@@ -46,7 +46,10 @@ static char sccsid[] = "@(#)main.c	5.18 (Berkeley) 3/1/91";
  */
 #include <stdio.h>
 #include "ftp_var.h"
+#ifndef KRB5_KRB4_COMPAT
+/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */
 #include <sys/socket.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
@@ -56,7 +59,10 @@ static char sccsid[] = "@(#)main.c	5.18 (Berkeley) 3/1/91";
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
+#ifndef KRB5_KRB4_COMPAT
+/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */
 #include <netdb.h>
+#endif
 #include <pwd.h>
 
 #define sig_t my_sig_t