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[])
{
extern int am_client;
extern int am_sender;
+ if (*path == '/') {
+ rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+ return -1;
+ }
+
p = strchr(host, '@');
if (p) {
user = host;
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;
char *request=NULL;
extern int am_sender;
extern int remote_version;
}
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;
}
- 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);
log_open();
- if (chroot(lp_path(i))) {
- rprintf(FERROR,"chroot %s failed\n", lp_path(i));
- io_printf(fd,"@ERROR: chroot failed\n");
- return -1;
- }
+ if (use_chroot) {
+ if (chroot(lp_path(i))) {
+ rprintf(FERROR,"chroot %s failed\n", lp_path(i));
+ io_printf(fd,"@ERROR: chroot failed\n");
+ return -1;
+ }
- if (chdir("/")) {
- rprintf(FERROR,"chdir %s failed\n", lp_path(i));
- io_printf(fd,"@ERROR: chdir failed\n");
- return -1;
- }
+ if (chdir("/")) {
+ rprintf(FERROR,"chdir %s failed\n", lp_path(i));
+ io_printf(fd,"@ERROR: chdir failed\n");
+ return -1;
+ }
- if (setgid(gid) || getgid() != gid) {
- rprintf(FERROR,"setgid %d failed\n", gid);
- io_printf(fd,"@ERROR: setgid failed\n");
- return -1;
- }
+ if (setgid(gid) || getgid() != gid) {
+ rprintf(FERROR,"setgid %d failed\n", gid);
+ io_printf(fd,"@ERROR: setgid failed\n");
+ return -1;
+ }
- if (setuid(uid) || getuid() != uid) {
- rprintf(FERROR,"setuid %d failed\n", uid);
- io_printf(fd,"@ERROR: setuid failed\n");
- return -1;
+ if (setuid(uid) || getuid() != 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);
}
}
- parse_arguments(argc, argv);
+ if (!use_chroot) {
+ /*
+ * Note that this is applied to all parameters, whether or not
+ * they are filenames, but no other legal parameters contain
+ * the forms that need to be sanitized so it doesn't hurt;
+ * it is not known at this point which parameters are files
+ * and which aren't.
+ */
+ for (i = 1; i < argc; i++) {
+ char *copy = sanitize_path(argv[i]);
+ free((void *)argv[i]);
+ argv[i] = copy;
+ }
+ }
+
+ 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",
free(request);
}
+#if !TRIDGE
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
+#endif
argc -= optind;
argp = argv + optind;
if (remote_version > 17 && am_sender)
io_start_multiplex_out(fd);
+ if (!ret) {
+ rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+ exit_cleanup(RERR_SYNTAX);
+ }
+
start_server(fd, fd, argc, argp);
return 0;
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);
int daemon_main(void)
{
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")
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);
+ }
+
+ set_nonblocking(STDIN_FILENO);
+
return start_daemon(STDIN_FILENO);
}
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();
rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+ if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
+ FILE *f;
+ int pid = (int) getpid();
+ cleanup_set_pid(pid);
+ 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(RERR_FILEIO);
+ }
+ fprintf(f, "%d\n", pid);
+ fclose(f);
+ }
+
start_accept_loop(rsync_port, start_daemon);
return -1;
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff