char *p, *user=NULL;
extern int remote_version;
extern int am_sender;
+ extern struct in_addr socket_address;
if (*path == '/') {
rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
- fd = open_socket_out(host, rsync_port);
+ fd = open_socket_out(host, rsync_port, &socket_address);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
}
io_printf(fd,"\n");
- if (remote_version > 17 && !am_sender)
- io_start_multiplex_in(fd);
+ if (remote_version < 23) {
+ if (remote_version == 22 || (remote_version > 17 && !am_sender))
+ io_start_multiplex_in(fd);
+ }
return client_run(fd, fd, -1, argc, argv);
}
module_id = i;
- if (lp_read_only(i))
- read_only = 1;
-
am_root = (getuid() == 0);
if (am_root) {
argp = argv + optind;
optind = 0;
- if (remote_version > 17 && am_sender)
- io_start_multiplex_out(fd);
+ if (remote_version < 23) {
+ if (remote_version == 22 || (remote_version > 17 && am_sender))
+ io_start_multiplex_out(fd);
+ }
if (!ret) {
option_error();
open("/dev/null", O_RDWR);
}
- set_nonblocking(STDIN_FILENO);
-
return start_daemon(STDIN_FILENO);
}
become_daemon();
if (!lp_load(config_file, 1)) {
- fprintf(stderr,"failed to load config file %s\n", config_file);
exit_cleanup(RERR_SYNTAX);
}
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
- fprintf(stderr,"failed to create pid file %s\n", pid_file);
+ rprintf(FLOG,"failed to create pid file %s\n", pid_file);
exit_cleanup(RERR_FILEIO);
}
slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);