[SCM] The rsync repository. - branch b3.0.x updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Sat Aug 6 12:25:27 MDT 2011
The branch, b3.0.x has been updated
via fe2c165 Fix misplaced parens on getnameinfo() call.
via 4c0055e Ignore socketpair() on cygwin. Fixes bug 8356.
from d706e88 Fix Minix build errors. Fixes bug 8313.
;a=shortlog;h=b3.0.x
- Log -----------------------------------------------------------------
commit fe2c165fca8bd5e9fa9660378647841e6b5a08d4
Author: Wayne Davison <wayned at samba.org>
Date: Sat Aug 6 11:21:40 2011 -0700
Fix misplaced parens on getnameinfo() call.
commit 4c0055ecbb51f7fbc878229ec615f93e1adc506f
Author: Wayne Davison <wayned at samba.org>
Date: Sat Aug 6 11:18:54 2011 -0700
Ignore socketpair() on cygwin. Fixes bug 8356.
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 4 ++++
socket.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 86f1793..21a6098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -675,7 +675,11 @@ AC_TRY_RUN([
main() {
int fd[2];
+#ifdef __CYGWIN__
+ exit(1);
+#else
exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
+#endif
}],
rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)])
if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then
diff --git a/socket.c b/socket.c
index c373056..b0d5475 100644
--- a/socket.c
+++ b/socket.c
@@ -303,7 +303,7 @@ int open_socket_out(char *host, int port, const char *bind_addr,
}
if (verbose >= 3) {
char buf[2048];
- if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
+ if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0)
snprintf(buf, sizeof buf, "*getnameinfo failure: %s*", gai_strerror(error));
rprintf(FINFO, "Connected to %s (%s)\n", h, buf);
}
@@ -315,7 +315,7 @@ int open_socket_out(char *host, int port, const char *bind_addr,
for (res = res0, j = 0; res; res = res->ai_next, j++) {
if (errnos[j] == 0)
continue;
- if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
+ if ((error = getnameinfo(res->ai_addr, res->ai_addrlen, buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0)
snprintf(buf, sizeof buf, "*getnameinfo failure: %s*", gai_strerror(error));
rsyserr(FERROR, errnos[j], "failed to connect to %s (%s)", h, buf);
}
--
The rsync repository.
More information about the rsync-cvs
mailing list