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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 96618b78b51814e3e79d9b98bd02cda052aa2169..4266d4c46733a7a61a09a5c9c5870547b96bcf55 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+       * v4rcp.c: Include port-sockets.h.
+
 2002-07-09  Jen Selby <jenselby@mit.edu>
 
        * login.M: added information about different command line options;

diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index 88870cc4b000ffb4141331796ca30aaba25a3382..2354a2c590f8889b0e9b11f19e4c1fed11c50d42 100644 (file)
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -79,6 +79,8 @@ static char sccsid[] = "@(#)rcp.c     5.10 (Berkeley) 9/20/88";
 #include <varargs.h>
 #endif
 
+#include "port-sockets.h"
+
 #ifdef KERBEROS
 #include <krb.h>
 #include <krbports.h>

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 36f31ed41f81f33bee6c00f00ee314f468ca55bb..7a12e409a08c09fb4620273cc36e6b253379cb57 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+       * ftpd.c: Include port-sockets.h.
+
 2002-06-25  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (ftpd): Don't use krb5util library.

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 8f1dba8d78edddca5241702c01778ca7913873f3..de29b138f56a9e62627803adfc28006d16b59bdd 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -125,6 +125,7 @@ char *ftpusers;
 extern int yyparse(void);
 
 #include <k5-util.h>
+#include "port-sockets.h"
 
 #ifdef KRB5_KRB4_COMPAT
 #include <krb5.h>

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index b8db935f9f1aec8dbbd577bce2b344eec65ec4be..ca9f76daf0ce5ab3d1b58157fa8d25ed6a1b711e 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (install): Don't install port-sockets.h.
+
 2002-07-09  Ken Raeburn  <raeburn@mit.edu>
 
        * krb5.hin: Put # for cpp directives in first column.

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 2f6972848f4ddda4b1bbd1b4592217e6cacd48ca..d350bf2b9c922a3a1612c061e4995ea917ab44ec 100644 (file)
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -66,5 +66,3 @@ clean-windows::
 install:: krb5.h profile.h
        $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
        $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
-       $(INSTALL_DATA) $(srcdir)/port-sockets.h \
-               $(DESTDIR)$(KRB5_INCDIR)$(S)port-sockets.h

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index 96700cfdf2c039709d52cf497a2a2c3c6be16cf8..b8af2409d7b69ecbfc9809ee7975ee9e90a77206 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+       * krb.h: Don't include port-sockets.h.
+
 2002-04-10  Danilo Almeida  <dalmeida@mit.edu>
 
        * krb.h: Do not include winsock.h for Win32, since we already use

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index ed90e0711d8f903702d5d2e590107b8aa2c7c4de..566de3b0b7055ab9b349ad742569dd92dcb7ddde 100644 (file)
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -37,9 +37,6 @@
 #include <time.h>
 #endif /* _WINDOWS */
 
-#include <port-sockets.h>
-
-
 /* Text describing error codes */
 #define                MAX_KRB_ERRORS  256
 extern const char *const krb_err_txt[MAX_KRB_ERRORS];

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 2bc238cbe4f8df21e0f8e38c2fbf0bc254865dfc..92141f0b7812d7149fc9edc8ae64909fa71d655f 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-12  Ken Raeburn  <raeburn@mit.edu>
+
+       * conv_creds.c: Include port-sockets.h instead of winsock.h or
+       netinet/in.h.
+       * krb524.h: Forward-declare struct types sockaddr, sockaddr_in.
+
 2002-07-09  Ken Raeburn  <raeburn@mit.edu>
 
        * krb524.h: Put # for cpp directives in first column.

diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c
index 01e91bb44921129170bf7c8fc75b2f50d10aa858..b4ebc1c40796653f0514dd0fcd8a6c11d7785ee7 100644 (file)
--- a/src/krb524/conv_creds.c
+++ b/src/krb524/conv_creds.c
@@ -24,11 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#ifdef _WIN32
-#include <winsock.h>
-#else
-#include <netinet/in.h>
-#endif
+#include "port-sockets.h"
 #if TARGET_OS_MAC
 #include <Kerberos/krb.h>
 #include <Kerberos/krb524.h>

diff --git a/src/krb524/krb524.h b/src/krb524/krb524.h
index 486f8a71ab04fd1370ce8b539d894bd1d9c2624c..cd46ae83c66b00b7a276e4412903a172b896cc88 100644 (file)
--- a/src/krb524/krb524.h
+++ b/src/krb524/krb524.h
@@ -61,6 +61,9 @@ KRB524INT_BEGIN_DECLS
 #if KRB524_PRIVATE
 extern int krb524_debug;
 
+struct sockaddr;
+struct sockaddr_in;
+
 int krb524_convert_tkt_skey
        (krb5_context context, krb5_ticket *v5tkt, KTEXT_ST *v4tkt, 
                   krb5_keyblock *v5_skey, krb5_keyblock *v4_skey,

diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog
index 0996826dc115d41e828d0cd2e6ebd132feb0f63b..fd62503064e9f229ab20d07a06bd7f7d3c93d1a0 100644 (file)
--- 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 c6779047afafff563b9d40f8ef1fcd95be0fb549..119d79bf699d9eae2e89434ad98c52c498f8a294 100644 (file)
--- 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 74c4529f0a647d82f425646de44749c3d6095a9b..deff714f5d4a65b462b9f163a2ef81a66aa7eded 100644 (file)
--- 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 2508afac4571221fd04860e27e392d083d19cb72..5a78be6fa002debc4efaad17d4a4332d05974fc8 100644 (file)
--- 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 b6068cd58867567c45dad717d3a5ae5fe9532664..bc9c045e55e9dea6fc14a6a8a2d070c2b3db2087 100644 (file)
--- 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 c9ed5d349c497686d9f315bf5ffac84b5b83ddf3..c2f4f2cb744154f64f696cf4a3f37ffe79ac077f 100644 (file)
--- 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 a9e0db1c79420929e5a398279314c72b12b144ff..9bce98c20587224c04bd2c464b5378118846bf75 100644 (file)
--- 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 471f7b73d459e45a7db28f9c476bdf28f8f5bc29..4523f318f8885f695a01e5925a149aa146f84379 100644 (file)
--- 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 b797a6a856cd63a63b1cde6b45dc9dd828c3b3c6..6d1219f9f29f257ca47f4bd6079f4210320e544a 100644 (file)
--- 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 22e9b668da7ca376ef949f8601018b8c4f7697d6..7e68c92def897dfb32b094dd4b95becc70e43948 100644 (file)
--- 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 b7d25804dc9eba0b87e844232b28de46038c5149..670ac6b2bcf019281c1f6be4985bbd259a74eeac 100644 (file)
--- 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 5581e4a790df835475db67eccfe36dc373f5c3cf..d733c258910a00998541dd1785ffd8b443498b34 100644 (file)
--- 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 6fcce62050a89d6c5dde261b0f118c3fd905ac37..676b90884e21f0b0b3a2cafe31efafe396f1bc83 100644 (file)
--- 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 f3cc584c1147247cef277e8815441fc40f27d88e..5ba891f3e1369e3a8d5e5a18b755a066a4327d3f 100644 (file)
--- 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 d80770c0965fc149bebd473330588aff61eeb6d7..80698a1ab3a4d2d8cde45113f919a3d414eb5409 100644 (file)
--- 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 5d6bb41bb98adbb68ab601ee0e933232562a9e1a..4e12c862326061b156457518808a2aa90dd54e8f 100644 (file)
--- 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 47a95424937bee534d4d5543bb7c36f1d0285b20..c69507d76fc257840fcfa16bd8d6112e1d93db99 100644 (file)
--- 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 691a4d11e9ec5f87d6ce0e5c02478ae008d2fb71..f7fed7857a9270d95475bf13df8c6df981e10fb6 100644 (file)
--- 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 d6c8c3825194e1e166e4b9e6c2ea65ccf36794b8..68ef84365e3836c8b6c1c0893ddd04f85b9a8f94 100644 (file)
--- 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>