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
Preparing for release of 2.6.4pre1
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
7dadb26
..
4e6ef60
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-90,7
+90,7
@@
static int establish_proxy_connection(int fd, char *host, int port,
if (*cp == '\r')
*cp = '\0';
if (strncmp(buffer, "HTTP/", 5) != 0) {
if (*cp == '\r')
*cp = '\0';
if (strncmp(buffer, "HTTP/", 5) != 0) {
- rprintf(FERROR, "bad response from proxy - %s\n",
+ rprintf(FERROR, "bad response from proxy -
-
%s\n",
buffer);
return -1;
}
buffer);
return -1;
}
@@
-98,7
+98,7
@@
static int establish_proxy_connection(int fd, char *host, int port,
while (*cp == ' ')
cp++;
if (*cp != '2') {
while (*cp == ' ')
cp++;
if (*cp != '2') {
- rprintf(FERROR, "bad response from proxy - %s\n",
+ rprintf(FERROR, "bad response from proxy -
-
%s\n",
buffer);
return -1;
}
buffer);
return -1;
}
@@
-452,7
+452,7
@@
void start_accept_loop(int port, int (*fn)(int, int))
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
-#if INET6
+#if
def
INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
"Try using --ipv4 or --ipv6 to avoid this listen() error.\n");
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
"Try using --ipv4 or --ipv6 to avoid this listen() error.\n");
@@
-506,6
+506,9
@@
void start_accept_loop(int port, int (*fn)(int, int))
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
+ /* Re-open log file in child before possibly giving
+ * up privileges (see log_close() above). */
+ log_open();
ret = fn(fd, fd);
close_all();
_exit(ret);
ret = fn(fd, fd);
close_all();
_exit(ret);
@@
-616,7
+619,7
@@
void set_socket_options(int fd, char *options)
case OPT_ON:
if (got_value)
case OPT_ON:
if (got_value)
- rprintf(FERROR,"syntax error - %s does not take a value\n",tok);
+ rprintf(FERROR,"syntax error -
-
%s does not take a value\n",tok);
{
int on = socket_options[i].value;
{
int on = socket_options[i].value;
@@
-648,16
+651,14
@@
void become_daemon(void)
}
/* detach from the terminal */
}
/* detach from the terminal */
-#if HAVE_SETSID
+#if
def
HAVE_SETSID
setsid();
setsid();
-#else
-#ifdef TIOCNOTTY
+#elif defined TIOCNOTTY
i = open("/dev/tty", O_RDWR);
if (i >= 0) {
ioctl(i, (int)TIOCNOTTY, (char *)0);
close(i);
}
i = open("/dev/tty", O_RDWR);
if (i >= 0) {
ioctl(i, (int)TIOCNOTTY, (char *)0);
close(i);
}
-#endif /* TIOCNOTTY */
#endif
/* make sure that stdin, stdout an stderr don't stuff things
* up (library functions, for example) */
#endif
/* make sure that stdin, stdout an stderr don't stuff things
* up (library functions, for example) */
@@
-693,7
+694,7
@@
static int socketpair_tcp(int fd[2])
goto failed;
memset(&sock2, 0, sizeof sock2);
goto failed;
memset(&sock2, 0, sizeof sock2);
-#if HAVE_SOCKADDR_IN_LEN
+#if
def
HAVE_SOCKADDR_IN_LEN
sock2.sin_len = sizeof sock2;
#endif
sock2.sin_family = PF_INET;
sock2.sin_len = sizeof sock2;
#endif
sock2.sin_family = PF_INET;