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

	* cnv_tkt_skey.c:
	* conv_creds.c:
	* conv_princ.c:
	* encode.c:
	* k524init.c:
	* krb524d.c:
	* misc.c:
	* test.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@10335 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 500facd0e..75aadab26 100644
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,16 @@
+Thu Dec 11 23:30:30 1997  Tom Yu  <tlyu@mit.edu>
+
+	* cnv_tkt_skey.c:
+	* conv_creds.c:
+	* conv_princ.c:
+	* encode.c:
+	* k524init.c:
+	* krb524d.c:
+	* misc.c:
+	* test.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.
+
 Mon Aug 18 13:02:31 1997  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Add AC_PROG_INSTALL as we do install here.
diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index 1903abc4e..afdb46cd4 100644
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <krb.h>
 #include "krb524.h"
diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c
index 7ae810e13..f1e8f3709 100644
--- a/src/krb524/conv_creds.c
+++ b/src/krb524/conv_creds.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <krb.h>
 
diff --git a/src/krb524/conv_princ.c b/src/krb524/conv_princ.c
index eea4fa09e..f55f4a23c 100644
--- a/src/krb524/conv_princ.c
+++ b/src/krb524/conv_princ.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
diff --git a/src/krb524/encode.c b/src/krb524/encode.c
index b45f361c0..fc40b794f 100644
--- a/src/krb524/encode.c
+++ b/src/krb524/encode.c
@@ -26,7 +26,6 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
diff --git a/src/krb524/k524init.c b/src/krb524/k524init.c
index 7a2b07f5a..3c355a29b 100644
--- a/src/krb524/k524init.c
+++ b/src/krb524/k524init.c
@@ -28,7 +28,6 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index d759313b9..f03651605 100644
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -32,10 +32,8 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
-#include <netdb.h>
 
 #include <krb.h>
 #include "krb524.h"
diff --git a/src/krb524/misc.c b/src/krb524/misc.c
index 183e78918..e28f4d1d8 100644
--- a/src/krb524/misc.c
+++ b/src/krb524/misc.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/socket.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
 
diff --git a/src/krb524/test.c b/src/krb524/test.c
index 281c897e2..1dba58e23 100644
--- a/src/krb524/test.c
+++ b/src/krb524/test.c
@@ -25,9 +25,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <netdb.h>
 
 #include <des.h>
 #include <krb.h>