diff options
| -rw-r--r-- | ctdb/common/ctdb_util.c | 4 | ||||
| -rw-r--r-- | ctdb/common/system_util.c | 2 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_util.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index cbab3672a67..0f367c2100e 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -359,8 +359,8 @@ void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip) sizeof(cip->ip.sin_addr)); } else { cip->ip6.sin6_family = AF_INET6; -#ifdef HAVE_SOCK_SIN_LEN - cip->ip6.sin_len = sizeof(ctdb_sock_addr); +#ifdef HAVE_SOCK_SIN6_LEN + cip->ip6.sin6_len = sizeof(ctdb_sock_addr); #endif cip->ip6.sin6_port = ip->ip6.sin6_port; memcpy(&cip->ip6.sin6_addr, diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c index f27eed7038d..f1e9763c52a 100644 --- a/ctdb/common/system_util.c +++ b/ctdb/common/system_util.c @@ -154,7 +154,7 @@ static bool parse_ipv6(const char *s, const char *ifaces, unsigned port, ctdb_so saddr->ip6.sin6_scope_id = if_nametoindex(ifaces); } -#ifdef HAVE_SOCK_SIN_LEN +#ifdef HAVE_SOCK_SIN6_LEN saddr->ip6.sin6_len = sizeof(*saddr); #endif return true; diff --git a/ctdb/protocol/protocol_util.c b/ctdb/protocol/protocol_util.c index 73652e7f060..c75555fa734 100644 --- a/ctdb/protocol/protocol_util.c +++ b/ctdb/protocol/protocol_util.c @@ -206,7 +206,7 @@ static int ipv6_from_string(const char *str, struct sockaddr_in6 *ip6) return EINVAL; } -#ifdef HAVE_SOCK_SIN_LEN +#ifdef HAVE_SOCK_SIN6_LEN ip6->sin6_len = sizeof(*ip6); #endif return 0; |