* 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 500facd0e68ffeecc3367103581459edc586beb1..75aadab26e7d77be2e1c2794d13473d80dcf4276 100644 (file)
--- 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 1903abc4e711292fc9e089e4057dd5371673799b..afdb46cd4bbe125641d4988d2e206158fe851fc2 100644 (file)
--- 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 7ae810e1352c058061dacac533f033ffa5827623..f1e8f370944451f7563e8055bed8a92183752439 100644 (file)
--- 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 eea4fa09e943cf91c8f62fa111c153c0dd013495..f55f4a23c094dae64f6f17141661d93ad9b9132c 100644 (file)
--- 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 b45f361c0bc437dbeabf6301f68202be9a00f19e..fc40b794f964c4884168d74118487fa88172735f 100644 (file)
--- 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 7a2b07f5a343b92bfb235d138d0be13ec5ebf702..3c355a29bf4361562746680b282339a92387ec7e 100644 (file)
--- 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 d759313b9f32f637e5e0c585e101e24f616165ba..f03651605b4303089d5f525c7348265f72aeaf63 100644 (file)
--- 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 183e789184c4947937e1156034c8518eeb171d10..e28f4d1d8bc716a79cad80ab6799bff6ff85489c 100644 (file)
--- 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 281c897e2443d1923bb0638e4b9645d72e7e95a2..1dba58e23f2c5fa38daea27d9b562df2afde179c 100644 (file)
--- 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>