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
In sigchild_handler(), finish with waitpid() before reinitializing
[rsync/rsync.git]
/
clientname.c
diff --git
a/clientname.c
b/clientname.c
index
6c86c12
..
df921aa
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);
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
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);
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;
}
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);
memset(sin, 0, sizeof(*sin));
sin->sin_family = AF_INET;
*ss_len = sizeof(struct sockaddr_in);
-#if
def HAVE_SOCKADDR
_LEN
+#if
HAVE_SOCKADDR_IN
_LEN
sin->sin_len = *ss_len;
#endif
sin->sin_port = sin6.sin6_port;
sin->sin_len = *ss_len;
#endif
sin->sin_port = sin6.sin6_port;