Fixed the destination path check so that it cannot exclude a

[rsync/rsync.git] / lib / getaddrinfo.c

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index a919ff6..0261f78 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -53,8 +53,15 @@ TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #define SMB_STRDUP(s) strdup(s)
 #endif
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 255
+#endif
+
 static int check_hostent_err(struct hostent *hp)
 {
+#ifndef INET6
+       extern int h_errno;
+#endif
        if (!hp) {
                switch (h_errno) {
                        case HOST_NOT_FOUND:
@@ -106,7 +113,7 @@ static char *get_canon_name_from_addr(struct in_addr ip,
                                int *perr)
 {
        return canon_name_from_hostent(
-                       gethostbyaddr(&ip, sizeof(ip), AF_INET),
+                       gethostbyaddr((void *)&ip, sizeof ip, AF_INET),
                        perr);
 }
 
@@ -399,8 +406,8 @@ static int gethostnameinfo(const struct sockaddr *sa,
 
        if (!(flags & NI_NUMERICHOST)) {
                struct hostent *hp = gethostbyaddr(
-                               &((struct sockaddr_in *)sa)->sin_addr,
-                               sizeof(struct in_addr),
+                               (void *)&((struct sockaddr_in *)sa)->sin_addr,
+                               sizeof (struct in_addr),
                                sa->sa_family);
                ret = check_hostent_err(hp);
                if (ret == 0) {
@@ -481,7 +488,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen,
                return EAI_FAIL;
        }
 
-       if (salen < sizeof(struct sockaddr_in)) {
+       if (salen < (socklen_t)sizeof (struct sockaddr_in)) {
                return EAI_FAIL;
        }