Don't install port-sockets.h, and don't include it from <kerberosIV/krb.h>.

Instead, include it in the source files that need it.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14627 dc483132-0cff-0310-8789-dd5450dbe970

19 files changed, 26 insertions, 0 deletions

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 0996826dc..fd6250306 100644
--- a/src/lib/krb4/ChangeLog
+++ b/src/lib/krb4/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+	* ad_print.c, cr_tkt.c, decomp_tkt.c, g_krbhst.c, g_phost.c,
+	g_tkt_svc.c, mk_priv.c, mk_safe.c, netread.c, netwrite.c,
+	prot_kdc.c, rd_priv.c, rd_safe.c, realmofhost.c, recvauth.c,
+	send_to_kdc.c, sendauth.c, tkt_string.c: Include port-sockets.h.
+
 2002-06-21  Ken Raeburn  <raeburn@mit.edu>
 
 	* mk_priv.c (krb4int_address_less): Put braces around v4mapped
diff --git a/src/lib/krb4/ad_print.c b/src/lib/krb4/ad_print.c
index c6779047a..119d79bf6 100644
--- a/src/lib/krb4/ad_print.c
+++ b/src/lib/krb4/ad_print.c
@@ -15,6 +15,7 @@
 #include "des.h"
 #include "krb4int.h"
 #include <stdio.h>
+#include "port-sockets.h"
 
 #ifndef _WINDOWS
 
diff --git a/src/lib/krb4/cr_tkt.c b/src/lib/krb4/cr_tkt.c
index 74c4529f0..deff714f5 100644
--- a/src/lib/krb4/cr_tkt.c
+++ b/src/lib/krb4/cr_tkt.c
@@ -29,6 +29,7 @@
 #include "krb.h"
 #include "prot.h"
 #include <string.h>
+#include "port-sockets.h"
 
 static int
 krb_cr_tkt_int (KTEXT tkt, unsigned int flags_in, char *pname, 
diff --git a/src/lib/krb4/decomp_tkt.c b/src/lib/krb4/decomp_tkt.c
index 2508afac4..5a78be6fa 100644
--- a/src/lib/krb4/decomp_tkt.c
+++ b/src/lib/krb4/decomp_tkt.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <krb5.h>
 #include "krb54proto.h"
+#include "port-sockets.h"
 
 #ifdef KRB_CRYPT_DEBUG
 extern int krb_debug;
diff --git a/src/lib/krb4/g_krbhst.c b/src/lib/krb4/g_krbhst.c
index b6068cd58..bc9c045e5 100644
--- a/src/lib/krb4/g_krbhst.c
+++ b/src/lib/krb4/g_krbhst.c
@@ -13,6 +13,7 @@
 #include "krb.h"
 #include <string.h>
 #include "krb4int.h"
+#include "port-sockets.h"
 
 /*
  * Given a Kerberos realm, find a host on which the Kerberos authenti-
diff --git a/src/lib/krb4/g_phost.c b/src/lib/krb4/g_phost.c
index c9ed5d349..c2f4f2cb7 100644
--- a/src/lib/krb4/g_phost.c
+++ b/src/lib/krb4/g_phost.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include "port-sockets.h"
 
 /*
  * This routine takes an alias for a host name and returns the first
diff --git a/src/lib/krb4/g_tkt_svc.c b/src/lib/krb4/g_tkt_svc.c
index a9e0db1c7..9bce98c20 100644
--- a/src/lib/krb4/g_tkt_svc.c
+++ b/src/lib/krb4/g_tkt_svc.c
@@ -7,6 +7,7 @@
 #include <string.h>
 #define	DEFINE_SOCKADDR
 #include "krb.h"
+#include "port-sockets.h"
 
 /* FIXME -- this should probably be calling mk_auth nowadays.  */
 #define	KRB_SENDAUTH_VERS "AUTHV0.1" 	/* MUST be KRB_SENDAUTH_VLEN chars */
diff --git a/src/lib/krb4/mk_priv.c b/src/lib/krb4/mk_priv.c
index 471f7b73d..4523f318f 100644
--- a/src/lib/krb4/mk_priv.c
+++ b/src/lib/krb4/mk_priv.c
@@ -39,6 +39,7 @@
 #include "prot.h"
 #include "des.h"
 #include "lsb_addr_cmp.h"
+#include "port-sockets.h"
 
 extern int krb_debug;
 
diff --git a/src/lib/krb4/mk_safe.c b/src/lib/krb4/mk_safe.c
index b797a6a85..6d1219f9f 100644
--- a/src/lib/krb4/mk_safe.c
+++ b/src/lib/krb4/mk_safe.c
@@ -40,6 +40,7 @@
 #include "des.h"
 #include "prot.h"
 #include "lsb_addr_cmp.h"
+#include "port-sockets.h"
 
 extern int krb_debug;
 
diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c
index 22e9b668d..7e68c92de 100644
--- a/src/lib/krb4/netread.c
+++ b/src/lib/krb4/netread.c
@@ -17,6 +17,7 @@
 #ifndef _WINDOWS
 extern int errno;
 #endif
+#include "port-sockets.h"
 
 /*
  * krb_net_read() reads from the file descriptor "fd" to the buffer
diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c
index b7d25804d..670ac6b2b 100644
--- a/src/lib/krb4/netwrite.c
+++ b/src/lib/krb4/netwrite.c
@@ -14,6 +14,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include "port-sockets.h"
 
 #ifndef _WINDOWS
 extern int errno;
diff --git a/src/lib/krb4/prot_kdc.c b/src/lib/krb4/prot_kdc.c
index 5581e4a79..d733c2589 100644
--- a/src/lib/krb4/prot_kdc.c
+++ b/src/lib/krb4/prot_kdc.c
@@ -29,6 +29,7 @@
 #include "krb.h"
 #include "prot.h"
 #include <string.h>
+#include "port-sockets.h"
 
 /*
  * encode_kdc_reply
diff --git a/src/lib/krb4/rd_priv.c b/src/lib/krb4/rd_priv.c
index 6fcce6205..676b90884 100644
--- a/src/lib/krb4/rd_priv.c
+++ b/src/lib/krb4/rd_priv.c
@@ -44,6 +44,7 @@
 #include "prot.h"
 #include "des.h"
 #include "lsb_addr_cmp.h"
+#include "port-sockets.h"
 
 extern int krb_debug;
 
diff --git a/src/lib/krb4/rd_safe.c b/src/lib/krb4/rd_safe.c
index f3cc584c1..5ba891f3e 100644
--- a/src/lib/krb4/rd_safe.c
+++ b/src/lib/krb4/rd_safe.c
@@ -42,6 +42,7 @@
 #include "prot.h"
 #include "des.h"
 #include "lsb_addr_cmp.h"
+#include "port-sockets.h"
 
 extern int krb_debug;
 
diff --git a/src/lib/krb4/realmofhost.c b/src/lib/krb4/realmofhost.c
index d80770c09..80698a1ab 100644
--- a/src/lib/krb4/realmofhost.c
+++ b/src/lib/krb4/realmofhost.c
@@ -21,6 +21,7 @@
 #else
 extern char *malloc();
 #endif
+#include "port-sockets.h"
 #include "krb4int.h"
 
 /*
diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c
index 5d6bb41bb..4e12c8623 100644
--- a/src/lib/krb4/recvauth.c
+++ b/src/lib/krb4/recvauth.c
@@ -20,6 +20,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include "port-sockets.h"
 
 
 #define	KRB_SENDAUTH_VERS	"AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN
diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c
index 47a954249..c69507d76 100644
--- a/src/lib/krb4/send_to_kdc.c
+++ b/src/lib/krb4/send_to_kdc.c
@@ -21,6 +21,7 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include "port-sockets.h"
 
 #define S_AD_SZ sizeof(struct sockaddr_in)
 
diff --git a/src/lib/krb4/sendauth.c b/src/lib/krb4/sendauth.c
index 691a4d11e..f7fed7857 100644
--- a/src/lib/krb4/sendauth.c
+++ b/src/lib/krb4/sendauth.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include "port-sockets.h"
 
 #define	KRB_SENDAUTH_VERS "AUTHV0.1" /* MUST be KRB_SENDAUTH_VLEN chars */
 /*
diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c
index d6c8c3825..68ef84365 100644
--- a/src/lib/krb4/tkt_string.c
+++ b/src/lib/krb4/tkt_string.c
@@ -13,6 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
+#include "port-sockets.h" /* XXX this gets us MAXPATHLEN but we should find
+			     a better way */
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>