return -1;
}
- if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+ if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
if (errno) {
rprintf(FERROR,"failed to open lock file %s : %s\n",
- lp_lock_file(), strerror(errno));
+ lp_lock_file(i), strerror(errno));
io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
- lp_lock_file(), strerror(errno));
+ lp_lock_file(i), 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());
+ lp_max_connections(i));
+ io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
}
return -1;
}
if (lp_read_only(i))
read_only = 1;
- p = lp_uid(i);
- if (!name_to_uid(p, &uid)) {
- if (!isdigit(*p)) {
- rprintf(FERROR,"Invalid uid %s\n", p);
- io_printf(fd,"@ERROR: invalid uid\n");
- return -1;
- }
- uid = atoi(p);
- }
+ am_root = (getuid() == 0);
- p = lp_gid(i);
- if (!name_to_gid(p, &gid)) {
- if (!isdigit(*p)) {
- rprintf(FERROR,"Invalid gid %s\n", p);
- io_printf(fd,"@ERROR: invalid gid\n");
- return -1;
- }
- gid = atoi(p);
+ if (am_root) {
+ p = lp_uid(i);
+ if (!name_to_uid(p, &uid)) {
+ if (!isdigit(*p)) {
+ rprintf(FERROR,"Invalid uid %s\n", p);
+ io_printf(fd,"@ERROR: invalid uid\n");
+ return -1;
+ }
+ uid = atoi(p);
+ }
+
+ p = lp_gid(i);
+ if (!name_to_gid(p, &gid)) {
+ if (!isdigit(*p)) {
+ rprintf(FERROR,"Invalid gid %s\n", p);
+ io_printf(fd,"@ERROR: invalid gid\n");
+ return -1;
+ }
+ gid = atoi(p);
+ }
}
+ p = lp_include_from(i);
+ add_exclude_file(p, 1, 1);
+
+ p = lp_include(i);
+ add_include_line(p);
+
p = lp_exclude_from(i);
add_exclude_file(p, 1, 0);
return -1;
}
- if (chdir("/")) {
+ if (!push_dir("/", 0)) {
rprintf(FERROR,"chdir %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
- if (setgid(gid) || getgid() != gid) {
+ } else {
+ if (!push_dir(lp_path(i), 0)) {
+ rprintf(FERROR,"chdir %s failed\n", lp_path(i));
+ io_printf(fd,"@ERROR: chdir failed\n");
+ return -1;
+ }
+ }
+
+ if (am_root) {
+ if (setgid(gid)) {
rprintf(FERROR,"setgid %d failed\n", gid);
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
- if (setuid(uid) || getuid() != uid) {
+ if (setuid(uid)) {
rprintf(FERROR,"setuid %d failed\n", uid);
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
- } else {
- if (!push_dir(lp_path(i), 0)) {
- rprintf(FERROR,"chdir %s failed\n", lp_path(i));
- io_printf(fd,"@ERROR: chdir failed\n");
- return -1;
- }
+ am_root = (getuid() == 0);
}
- am_root = (getuid() == 0);
-
io_printf(fd,"@RSYNCD: OK\n");
argv[argc++] = "rsyncd";
* and which aren't.
*/
for (i = 1; i < argc; i++) {
- char *copy = sanitize_path(argv[i]);
- free((void *)argv[i]);
- argv[i] = copy;
+ sanitize_path(argv[i]);
}
}
- ret = parse_arguments(argc, argv);
+ ret = parse_arguments(argc, argv, 0);
if (request) {
if (*auth_user) {
io_start_multiplex_out(fd);
if (!ret) {
- rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
- exit_cleanup(RERR_SYNTAX);
+ option_error();
}
if (lp_timeout(i)) {
extern char *config_file;
char *pid_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)) {
int i;