From 20af321fea4239819abd1bcbd91e7d234ab02161 Mon Sep 17 00:00:00 2001 From: damien Date: Wed, 19 Jan 2000 02:45:07 +0000 Subject: [PATCH] - SCO compile fixes from Gary E. Miller --- ChangeLog | 1 + bsd-rresvport.c | 8 ++++---- configure.in | 4 ++-- includes.h | 3 +++ sshconnect.c | 10 +++++----- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9cfe0a7b..6b6dd40b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 20000119 + - SCO compile fixes from Gary E. Miller - Compile fix from Darren_Hall@progressive.com 20000118 diff --git a/bsd-rresvport.c b/bsd-rresvport.c index c29165fa..99c150e0 100644 --- a/bsd-rresvport.c +++ b/bsd-rresvport.c @@ -61,18 +61,18 @@ rresvport_af(alport, af) struct sockaddr *sa; u_int16_t *portp; int s; - int sa_len; + int salen; bzero(&ss, sizeof ss); sa = (struct sockaddr *)&ss; switch (af) { case AF_INET: - sa_len = sizeof(struct sockaddr_in); + salen = sizeof(struct sockaddr_in); portp = &((struct sockaddr_in *)sa)->sin_port; break; case AF_INET6: - sa_len = sizeof(struct sockaddr_in6); + salen = sizeof(struct sockaddr_in6); portp = &((struct sockaddr_in6 *)sa)->sin6_port; break; default: @@ -87,7 +87,7 @@ rresvport_af(alport, af) *portp = htons(*alport); if (*alport < IPPORT_RESERVED - 1) { - if (bind(s, sa, sa_len) >= 0) + if (bind(s, sa, salen) >= 0) return (s); if (errno != EADDRINUSE) { (void)close(s); diff --git a/configure.in b/configure.in index a5da0db9..d11c519d 100644 --- a/configure.in +++ b/configure.in @@ -141,7 +141,7 @@ if test -z "$no_libnsl" ; then fi dnl Checks for header files. -AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) +AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h) dnl Checks for library functions. AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty) @@ -188,7 +188,7 @@ AC_TRY_COMPILE( [AC_MSG_RESULT(no)] ) -if test -z "$have_u_intxx_t" -a -z "$have_intxx_t" -a \ +if test -z "$have_u_intxx_t" -o -z "$have_intxx_t" -a \ "x$ac_cv_header_sys_bitypes_h" = "xyes" then AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h]) diff --git a/includes.h b/includes.h index b4af0c22..3abf2851 100644 --- a/includes.h +++ b/includes.h @@ -86,6 +86,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } # include # endif #endif +#ifdef HAVE_SYS_SYSMACROS_H +# include +#endif #include "version.h" diff --git a/sshconnect.c b/sshconnect.c index 56cc93f2..c1b38f0f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1070,7 +1070,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) HostStatus host_status; HostStatus ip_status; int local = 0, host_ip_differ = 0; - int sa_len; + int salen; char ntop[NI_MAXHOST]; /* @@ -1084,15 +1084,15 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) switch (hostaddr->sa_family) { case AF_INET: local = (ntohl(((struct sockaddr_in *)hostaddr)->sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; - sa_len = sizeof(struct sockaddr_in); + salen = sizeof(struct sockaddr_in); break; case AF_INET6: local = IN6_IS_ADDR_LOOPBACK(&(((struct sockaddr_in6 *)hostaddr)->sin6_addr)); - sa_len = sizeof(struct sockaddr_in6); + salen = sizeof(struct sockaddr_in6); break; default: local = 0; - sa_len = sizeof(struct sockaddr_storage); + salen = sizeof(struct sockaddr_storage); break; } if (local) { @@ -1108,7 +1108,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) options.check_host_ip = 0; if (options.check_host_ip) { - if (getnameinfo(hostaddr, sa_len, ntop, sizeof(ntop), + if (getnameinfo(hostaddr, salen, ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST) != 0) fatal("check_host_key: getnameinfo failed"); ip = xstrdup(ntop); -- 2.45.2