Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add understanding of RSYNC_PROTECT_ARGS environment var.
[rsync/rsync.git]
/
lib
/
getaddrinfo.c
diff --git
a/lib/getaddrinfo.c
b/lib/getaddrinfo.c
index
838e708
..
96d7a2b
100644
(file)
--- a/
lib/getaddrinfo.c
+++ b/
lib/getaddrinfo.c
@@
-113,7
+113,7
@@
static char *get_canon_name_from_addr(struct in_addr ip,
int *perr)
{
return canon_name_from_hostent(
int *perr)
{
return canon_name_from_hostent(
- gethostbyaddr(
&ip, sizeof(ip)
, AF_INET),
+ gethostbyaddr(
(void *)&ip, sizeof ip
, AF_INET),
perr);
}
perr);
}
@@
-295,9
+295,8
@@
int getaddrinfo(const char *node,
res);
} else if (hints.ai_flags & AI_NUMERICHOST) {
struct in_addr ip;
res);
} else if (hints.ai_flags & AI_NUMERICHOST) {
struct in_addr ip;
- if (
!inet_aton(node, &ip)) {
+ if (
inet_pton(AF_INET, node, &ip) <= 0)
return EAI_FAIL;
return EAI_FAIL;
- }
return getaddr_info_single_addr(service,
ntohl(ip.s_addr),
&hints,
return getaddr_info_single_addr(service,
ntohl(ip.s_addr),
&hints,
@@
-492,13
+491,10
@@
int getnameinfo(const struct sockaddr *sa, socklen_t salen,
return EAI_FAIL;
}
return EAI_FAIL;
}
- /* We don't support those. */
- if ((node && !(flags & NI_NUMERICHOST))
- || (service && !(flags & NI_NUMERICSERV)))
- return EAI_FAIL;
-
if (node) {
if (node) {
- return gethostnameinfo(sa, node, nodelen, flags);
+ int ret = gethostnameinfo(sa, node, nodelen, flags);
+ if (ret)
+ return ret;
}
if (service) {
}
if (service) {