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;
}
- 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);
request = strdup(p);
start_glob++;
}
- glob_expand(name, argv, &argc, MAX_ARGS);
+ glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot);
} else {
argc++;
}
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");
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
motd = lp_motd_file();
- if (*motd) {
+ if (motd && *motd) {
FILE *f = fopen(motd,"r");
while (f && !feof(f)) {
int len = fread(line, 1, sizeof(line)-1, f);
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);