Use new HAVE_SOCKADDR_SIN_LEN define (replaces HAVE_SOCKADDR_LEN).

[rsync/rsync.git] / clientname.c

diff --git a/clientname.c b/clientname.c
index 6c86c12..5dbaaf9 100644 (file)
--- a/clientname.c
+++ b/clientname.c
@@ -130,7 +130,7 @@ char *client_name(int fd)
                        ssp = (struct sockaddr_storage *) &sin6;
                        ss_len = sizeof sin6;
                        memset(ssp, 0, ss_len);
-                       inet_pton(AF_INET6, addr, &sin6.sin6_addr.s6_addr);
+                       inet_pton(AF_INET6, addr, &sin6.sin6_addr);
                        sin6.sin6_family = AF_INET6;
                } else
 #endif
@@ -138,7 +138,7 @@ char *client_name(int fd)
                        ssp = (struct sockaddr_storage *) &sin;
                        ss_len = sizeof sin;
                        memset(ssp, 0, ss_len);
-                       inet_pton(AF_INET, addr, &sin.sin_addr.s_addr);
+                       inet_pton(AF_INET, addr, &sin.sin_addr);
                        sin.sin_family = AF_INET;
                }
 
@@ -195,7 +195,7 @@ void client_sockaddr(int fd,
                memset(sin, 0, sizeof(*sin));
                sin->sin_family = AF_INET;
                *ss_len = sizeof(struct sockaddr_in);
-#ifdef HAVE_SOCKADDR_LEN
+#if HAVE_SOCKADDR_SIN_LEN
                sin->sin_len = *ss_len;
 #endif
                sin->sin_port = sin6.sin6_port;