detect list_only a bit earlier

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 557eb5f..9546110 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -25,6 +25,7 @@ extern int read_only;
 extern int verbose;
 extern int rsync_port;
 char *auth_user;
+int sanitize_paths = 0;
 
 int start_socket_client(char *host, char *path, int argc, char *argv[])
 {
@@ -34,8 +35,13 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        char line[MAXPATHLEN];
        char *p, *user=NULL;
        extern int remote_version;
-       extern int am_client;
        extern int am_sender;
+       extern struct in_addr socket_address;
+
+       if (argc == 0 && !am_sender) {
+               extern int list_only;
+               list_only = 1;
+       }
 
        if (*path == '/') {
                rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
@@ -52,9 +58,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        if (!user) user = getenv("USER");
        if (!user) user = getenv("LOGNAME");
 
-       am_client = 1;
-
-       fd = open_socket_out(host, rsync_port);
+       fd = open_socket_out(host, rsync_port, &socket_address);
        if (fd == -1) {
                exit_cleanup(RERR_SOCKETIO);
        }
@@ -102,8 +106,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        }
        io_printf(fd,"\n");
 
-       if (remote_version > 17 && !am_sender)
-               io_start_multiplex_in(fd);
+       if (remote_version < 23) {
+               if (remote_version == 22 || (remote_version > 17 && !am_sender))
+                       io_start_multiplex_in(fd);
+       }
 
        return client_run(fd, fd, -1, argc, argv);
 }
@@ -164,9 +170,6 @@ static int rsync_module(int fd, int i)
 
        module_id = i;
 
-       if (lp_read_only(i))
-               read_only = 1;
-
        am_root = (getuid() == 0);
 
        if (am_root) {
@@ -212,7 +215,7 @@ static int rsync_module(int fd, int i)
                        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;
@@ -224,6 +227,7 @@ static int rsync_module(int fd, int i)
                        io_printf(fd,"@ERROR: chdir failed\n");
                        return -1;
                }
+               sanitize_paths = 1;
        }
 
        if (am_root) {
@@ -265,7 +269,7 @@ static int rsync_module(int fd, int i)
                                request = strdup(p);
                                start_glob++;
                        }
-                       glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot);
+                       glob_expand(name, argv, &argc, MAX_ARGS);
                } else {
                        argc++;
                }
@@ -279,7 +283,7 @@ static int rsync_module(int fd, int i)
                }
        }
 
-       if (!use_chroot) {
+       if (sanitize_paths) {
                /*
                 * Note that this is applied to all parameters, whether or not
                 *    they are filenames, but no other legal parameters contain
@@ -288,11 +292,11 @@ static int rsync_module(int fd, int i)
                 *    and which aren't.
                 */
                for (i = 1; i < argc; i++) {
-                       sanitize_path(argv[i]);
+                       sanitize_path(argv[i], NULL);
                }
        }
 
-       ret = parse_arguments(argc, argv);
+       ret = parse_arguments(argc, argv, 0);
 
        if (request) {
                if (*auth_user) {
@@ -316,8 +320,10 @@ static int rsync_module(int fd, int i)
        argp = argv + optind;
        optind = 0;
 
-       if (remote_version > 17 && am_sender)
-               io_start_multiplex_out(fd);
+       if (remote_version < 23) {
+               if (remote_version == 22 || (remote_version > 17 && am_sender))
+                       io_start_multiplex_out(fd);
+       }
 
        if (!ret) {
                option_error();
@@ -362,7 +368,7 @@ static int start_daemon(int fd)
 
        set_socket_options(fd,"SO_KEEPALIVE");
        set_socket_options(fd,lp_socket_options());
-       
+       set_nonblocking(fd);
 
        io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
@@ -420,13 +426,9 @@ static int start_daemon(int fd)
 int daemon_main(void)
 {
        extern char *config_file;
+       extern int orig_umask;
        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;
 
@@ -438,15 +440,12 @@ int daemon_main(void)
                        open("/dev/null", O_RDWR);
                }
 
-               set_nonblocking(STDIN_FILENO);
-
                return start_daemon(STDIN_FILENO);
        }
 
        become_daemon();
 
        if (!lp_load(config_file, 1)) {
-               fprintf(stderr,"failed to load config file %s\n", config_file);
                exit_cleanup(RERR_SYNTAX);
        }
 
@@ -455,16 +454,19 @@ int daemon_main(void)
        rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
 
        if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
-               FILE *f;
+               char pidbuf[16];
+               int fd;
                int pid = (int) getpid();
                cleanup_set_pid(pid);
-               if ((f = fopen(lp_pid_file(), "w")) == NULL) {
+               if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
+                                       0666 & ~orig_umask)) == -1) {
                    cleanup_set_pid(0);
-                   fprintf(stderr,"failed to create pid file %s\n", pid_file);
+                   rprintf(FLOG,"failed to create pid file %s\n", pid_file);
                    exit_cleanup(RERR_FILEIO);
                }
-               fprintf(f, "%d\n", pid);
-               fclose(f);
+               slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               write(fd, pidbuf, strlen(pidbuf));
+               close(fd);
        }
 
        start_accept_loop(rsync_port, start_daemon);