* krlogind.c:

	* krshd.c:
	* login.c:
	* v4rcp.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@10331 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 30 insertions, 4 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 7154e928a..6848c1dbe 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,12 @@
+Thu Dec 11 23:20:20 1997  Tom Yu  <tlyu@mit.edu>
+
+	* krlogind.c:
+	* krshd.c:
+	* login.c:
+	* v4rcp.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 Nov 20 16:42:54 1997  Tom Yu  <tlyu@mit.edu>
 
 	* krlogind.c (recvauth): Fix args in call to
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 270fbf7ba..d68b7757c 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -105,7 +105,10 @@ char copyright[] =
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <sys/socket.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/file.h>
@@ -146,8 +149,11 @@ char copyright[] =
 #else
 #include <sgtty.h>
 #endif
-     
+
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <netdb.h>
+#endif
 #include <syslog.h>
 #include <string.h>
 #include <sys/param.h>
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 7e5573a69..991856399 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -87,7 +87,10 @@ char copyright[] =
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <sys/socket.h>
+#endif
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -115,8 +118,11 @@ char copyright[] =
 #endif
      
 #include <signal.h>
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <netdb.h>
-     
+#endif
+
 #ifdef CRAY
 #ifndef NO_UDB
 #include <udb.h>
@@ -149,6 +155,7 @@ char copyright[] =
 #include "krb5.h"
 #include "com_err.h"
 #include "loginpaths.h"
+#include <kerberosIV/krb.h>
 
 #define ARGSTR	"ek54ciD:S:M:AP:?L:"
 
@@ -492,7 +499,6 @@ char *kremuser;
 krb5_principal client;
 krb5_authenticator *kdata;
 
-#include <kerberosIV/krb.h>
 AUTH_DAT	*v4_kdata;
 KTEXT		v4_ticket;
 
diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index 4aa2e8759..3afe88091 100644
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -172,7 +172,6 @@ typedef sigtype (*handler)();
 
 #ifdef KRB4
 #include <krb.h>
-#include <netdb.h>
 #include <netinet/in.h>
 #ifdef HAVE_KRB4_PROTO_H
 #include <krb4-proto.h>
diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index 4ed931584..5c0b5896c 100644
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -49,7 +49,10 @@ static char sccsid[] = "@(#)rcp.c	5.10 (Berkeley) 9/20/88";
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/file.h>
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <sys/socket.h>
+#endif
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
@@ -64,7 +67,10 @@ static char sccsid[] = "@(#)rcp.c	5.10 (Berkeley) 9/20/88";
 #include <signal.h>
 #include <pwd.h>
 #include <ctype.h>
+#ifndef KERBEROS
+/* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */
 #include <netdb.h>
+#endif
 #include <errno.h>
 #ifdef KERBEROS
 #include <krb.h>