extern int read_only;
extern int verbose;
extern int rsync_port;
+char *auth_user;
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
- exit_cleanup(1);
+ exit_cleanup(RERR_SOCKETIO);
}
server_options(sargs,&sargc);
char *addr = client_addr(fd);
char *host = client_name(fd);
char *name = lp_name(i);
- char *user;
int use_chroot = lp_use_chroot(i);
int start_glob=0;
int ret;
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;
}
- user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+ auth_user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
- if (!user) {
+ if (!auth_user) {
rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
name, client_name(fd), client_addr(fd));
io_printf(fd,"@ERROR: auth failed on module %s\n",name);
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);
request = strdup(p);
start_glob++;
}
- glob_expand(name, argv, &argc, MAX_ARGS);
+ glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot);
} else {
argc++;
}
* 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);
if (request) {
- if (*user) {
+ if (*auth_user) {
rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
am_sender?"on":"to",
- request, user, host, addr);
+ request, auth_user, host, addr);
} else {
rprintf(FINFO,"rsync %s %s from %s (%s)\n",
am_sender?"on":"to",
io_start_multiplex_out(fd);
if (!ret) {
- rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
- exit_cleanup(1);
+ option_error();
+ }
+
+ if (lp_timeout(i)) {
+ extern int io_timeout;
+ io_timeout = lp_timeout(i);
}
start_server(fd, fd, argc, argp);
extern int remote_version;
if (!lp_load(config_file, 0)) {
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
set_socket_options(fd,"SO_KEEPALIVE");
if (!lp_load(config_file, 1)) {
fprintf(stderr,"failed to load config file %s\n", config_file);
- exit_cleanup(1);
+ exit_cleanup(RERR_SYNTAX);
}
log_open();
if ((f = fopen(lp_pid_file(), "w")) == NULL) {
cleanup_set_pid(0);
fprintf(stderr,"failed to create pid file %s\n", pid_file);
- exit_cleanup(1);
+ exit_cleanup(RERR_FILEIO);
}
fprintf(f, "%d\n", pid);
fclose(f);