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
Try out DocBook SGML to see if it's easier than Texinfo.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
1cbabd3
..
1a638db
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-80,6
+80,8
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("LOGNAME");
if (verbose >= 2) {
if (!user) user = getenv("LOGNAME");
if (verbose >= 2) {
+ rprintf(FINFO, "opening tcp connection to %s port %d\n",
+ host, rsync_port);
}
fd = open_socket_out_wrapped (host, rsync_port, bind_address,
default_af_hint);
}
fd = open_socket_out_wrapped (host, rsync_port, bind_address,
default_af_hint);
@@
-129,7
+131,10
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0);
if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0);
- rprintf(FINFO,"%s\n", line);
+ if (strncmp(line, "@ERROR", 6) == 0)
+ rprintf(FERROR,"%s\n", line);
+ else
+ rprintf(FINFO,"%s\n", line);
}
kludge_around_eof = False;
}
kludge_around_eof = False;
@@
-282,7
+287,6
@@
static int rsync_module(int fd, int i)
}
if (am_root) {
}
if (am_root) {
-#ifdef HAVE_SETGROUPS
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(0, NULL)) {
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(0, NULL)) {
@@
-290,7
+294,6
@@
static int rsync_module(int fd, int i)
io_printf(fd, "@ERROR: setgroups failed\n");
return -1;
}
io_printf(fd, "@ERROR: setgroups failed\n");
return -1;
}
-#endif
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a