diff options
30 files changed, 55 insertions, 10 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 96618b78b5..4266d4c467 100644 --- 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 88870cc4b0..2354a2c590 100644 --- 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 36f31ed41f..7a12e409a0 100644 --- 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 8f1dba8d78..de29b138f5 100644 --- 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 b8db935f9f..ca9f76daf0 100644 --- 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 2f6972848f..d350bf2b9c 100644 --- 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 96700cfdf2..b8af2409d7 100644 --- 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 ed90e0711d..566de3b0b7 100644 --- 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 2bc238cbe4..92141f0b78 100644 --- 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 01e91bb449..b4ebc1c407 100644 --- 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 486f8a71ab..cd46ae83c6 100644 --- 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 0996826dc1..fd62503064 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 c6779047af..119d79bf69 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 74c4529f0a..deff714f5d 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 2508afac45..5a78be6fa0 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 b6068cd588..bc9c045e55 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 c9ed5d349c..c2f4f2cb74 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 a9e0db1c79..9bce98c205 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 471f7b73d4..4523f318f8 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 b797a6a856..6d1219f9f2 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 22e9b668da..7e68c92def 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 b7d25804dc..670ac6b2bc 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 5581e4a790..d733c25891 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 6fcce62050..676b90884e 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 f3cc584c11..5ba891f3e1 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 d80770c096..80698a1ab3 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 5d6bb41bb9..4e12c86232 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 47a9542493..c69507d76f 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 691a4d11e9..f7fed7857a 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 d6c8c38251..68ef84365e 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> |