char *name = lp_name(i);
char *user;
int start_glob=0;
+ int ret;
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",
}
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
- rprintf(FERROR,"max connections (%d) reached\n",
- lp_max_connections());
- io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+ if (errno) {
+ rprintf(FERROR,"failed to open lock file %s : %s\n",
+ lp_lock_file(), strerror(errno));
+ io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
+ lp_lock_file(), strerror(errno));
+ } else {
+ rprintf(FERROR,"max connections (%d) reached\n",
+ lp_max_connections());
+ io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+ }
return -1;
}
}
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";
}
}
- parse_arguments(argc, argv);
+ ret = parse_arguments(argc, argv);
if (request) {
if (*user) {
if (remote_version > 17 && am_sender)
io_start_multiplex_out(fd);
+ if (!ret) {
+ rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+ exit_cleanup(1);
+ }
+
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 */
+ int i;
+
+ /* we are running via inetd - close off stdout and
+ stderr so that library functions (and getopt) don't
+ try to use them. Redirect them to /dev/null */
+ for (i=1;i<3;i++) {
+ close(i);
+ open("/dev/null", O_RDWR);
+ }
return start_daemon(STDIN_FILENO);
}