char line[MAXPATHLEN];
char *p, *user=NULL;
extern int remote_version;
+ extern int am_client;
+ extern int am_sender;
p = strchr(host, '@');
if (p) {
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
+ am_client = 1;
+
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
exit_cleanup(1);
}
io_printf(fd,"\n");
+ if (remote_version > 17 && !am_sender)
+ io_start_multiplex_in(fd);
+
return client_run(fd, fd, -1, argc, argv);
}
int start_glob=0;
char *request=NULL;
extern int am_sender;
+ extern int remote_version;
+ extern int am_root;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
}
p = lp_exclude_from(i);
- add_exclude_file(p, 1);
+ add_exclude_file(p, 1, 0);
p = lp_exclude(i);
add_exclude_line(p);
return -1;
}
+ am_root = (getuid() == 0);
+
io_printf(fd,"@RSYNCD: OK\n");
argv[argc++] = "rsyncd";
argp = argv + optind;
optind = 0;
+ if (remote_version > 17 && am_sender)
+ io_start_multiplex_out(fd);
+
start_server(fd, fd, argc, argp);
return 0;
{
extern char *config_file;
+ /* this ensures that we don't call getcwd after the chroot,
+ which doesn't work on platforms that use popen("pwd","r")
+ for getcwd */
+ push_dir("/", 0);
+
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);