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
Run the daemon test using faked tcp connections.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
70c12e2
..
0f54361
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-78,7
+78,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
- fd = open_socket_out(host, rsync_port, &socket_address);
+ fd = open_socket_out
_wrapped
(host, rsync_port, &socket_address);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
@@
-244,6
+244,10
@@
static int rsync_module(int fd, int i)
log_init();
if (use_chroot) {
log_init();
if (use_chroot) {
+ /* TODO: If we're not running as root, then we'll get
+ * an error here. I wonder if we should perhaps just
+ * log a warning here, and continue anyhow using the
+ * push_dir feature? -- mbp 2001-08-31 */
if (chroot(lp_path(i))) {
rsyserr(FERROR, errno, "chroot %s failed", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");
if (chroot(lp_path(i))) {
rsyserr(FERROR, errno, "chroot %s failed", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");