From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 27 Jan 2004 02:43:00 +0000 (-0500)
Subject: struct sockaddr_storage progress
X-Git-Tag: NTP_4_2_3~185^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0f031b42cb25d8f33b15d2b49ad0d16c01e998b;p=thirdparty%2Fntp.git

struct sockaddr_storage progress

bk: 4015d034OPyPK5ntgwdXPcrVeQ9K0A
---

diff --git a/configure.in b/configure.in
index 767d388d4..87f3c2a97 100644
--- a/configure.in
+++ b/configure.in
@@ -561,8 +561,6 @@ return 0;],
 	ac_cv_struct_sockaddr_storage=yes,
 	ac_cv_struct_sockaddr_storage=no)
 ])
-# HMS: Override this for now.
-ac_cv_struct_sockaddr_storage=no
 if test $ac_cv_struct_sockaddr_storage = yes; then
     AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?])
 fi
diff --git a/include/ntp_rfc2553.h b/include/ntp_rfc2553.h
index 674a08a50..20c732f14 100644
--- a/include/ntp_rfc2553.h
+++ b/include/ntp_rfc2553.h
@@ -178,7 +178,6 @@ struct sockaddr_in6 {
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
 #endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
 
-#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
 struct sockaddr_storage {
 #ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
 	u_int8_t	ss_len;		/* address length */
@@ -190,7 +189,6 @@ struct sockaddr_storage {
 	u_int64_t	__ss_align;	/* force desired structure storage alignment */
 	char		__ss_pad2[_SS_PAD2SIZE];
 };
-#endif /* not HAVE_STRUCT_SOCKADDR_STORAGE */
 
 struct addrinfo {
 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */