Changed the rdev code to have both an "rdev" variable (which always

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 305f6e6..a2bbfe8 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -27,17 +27,31 @@
 
 #include "rsync.h"
 
+extern int am_sender;
+extern int am_server;
+extern int am_daemon;
+extern int am_root;
 extern int module_id;
 extern int read_only;
 extern int verbose;
 extern int rsync_port;
-char *auth_user;
+extern int kludge_around_eof;
+extern int daemon_over_rsh;
+extern int list_only;
 extern int sanitize_paths;
 extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
+extern int io_timeout;
+extern int orig_umask;
+extern int no_detach;
+extern int default_af_hint;
+extern char *bind_address;
 extern struct exclude_struct **server_exclude_list;
 extern char *exclude_path_prefix;
+extern char *config_file;
+
+char *auth_user;
 
 /**
  * Run a client connected to an rsyncd.  The alternative to this
@@ -57,8 +71,6 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 {
        int fd, ret;
        char *p, *user=NULL;
-       extern char *bind_address;
-       extern int default_af_hint;
 
        /* this is redundant with code in start_inband_exchange(), but
         * this short-circuits a problem before we open a socket, and
@@ -100,10 +112,6 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
        int sargc = 0;
        char line[MAXPATHLEN];
        char *p;
-       extern int kludge_around_eof;
-       extern int am_sender;
-       extern int daemon_over_rsh;
-       extern int list_only;
 
        if (argc == 0 && !am_sender)
                list_only = 1;
@@ -129,7 +137,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
 
        sargs[sargc] = NULL;
 
-       io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+       io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
        if (!read_line(f_in, line, sizeof(line)-1)) {
                rprintf(FERROR, "rsync: did not see server greeting\n");
@@ -192,7 +200,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
        io_printf(f_out, "\n");
 
        if (protocol_version < 23) {
-               if (protocol_version == 22 || (protocol_version > 17 && !am_sender))
+               if (protocol_version == 22 || !am_sender)
                        io_start_multiplex_in(f_in);
        }
 
@@ -217,10 +225,6 @@ static int rsync_module(int f_in, int f_out, int i)
        int start_glob=0;
        int ret;
        char *request=NULL;
-       extern int am_sender;
-       extern int am_server;
-       extern int am_daemon;
-       extern int am_root;
 
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -294,6 +298,8 @@ static int rsync_module(int f_in, int f_out, int i)
         * supplementary groups. */
 
        exclude_path_prefix = use_chroot? "" : lp_path(i);
+       if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
+               exclude_path_prefix = "";
 
        p = lp_include_from(i);
        add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
@@ -330,14 +336,14 @@ static int rsync_module(int f_in, int f_out, int i)
                        return -1;
                }
 
-               if (!push_dir("/", 0)) {
+               if (!push_dir("/")) {
                        rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
                        io_printf(f_out, "@ERROR: chdir failed\n");
                        return -1;
                }
 
        } else {
-               if (!push_dir(lp_path(i), 0)) {
+               if (!push_dir(lp_path(i))) {
                        rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
                        io_printf(f_out, "@ERROR: chdir failed\n");
                        return -1;
@@ -455,7 +461,7 @@ static int rsync_module(int f_in, int f_out, int i)
 #endif
 
        if (protocol_version < 23) {
-               if (protocol_version == 22 || (protocol_version > 17 && am_sender))
+               if (protocol_version == 22 || am_sender)
                        io_start_multiplex_out(f_out);
        }
 
@@ -473,7 +479,6 @@ static int rsync_module(int f_in, int f_out, int i)
        }
 
        if (lp_timeout(i)) {
-               extern int io_timeout;
                io_timeout = lp_timeout(i);
        }
 
@@ -505,8 +510,6 @@ int start_daemon(int f_in, int f_out)
        char line[200];
        char *motd;
        int i = -1;
-       extern char *config_file;
-       extern int am_server;
 
        if (!lp_load(config_file, 0)) {
                exit_cleanup(RERR_SYNTAX);
@@ -520,7 +523,7 @@ int start_daemon(int f_in, int f_out)
                set_nonblocking(f_in);
        }
 
-       io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+       io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
 
        motd = lp_motd_file();
        if (motd && *motd) {
@@ -577,10 +580,7 @@ int start_daemon(int f_in, int f_out)
 
 int daemon_main(void)
 {
-       extern char *config_file;
-       extern int orig_umask;
        char *pid_file;
-       extern int no_detach;
 
        if (is_a_socket(STDIN_FILENO)) {
                int i;
@@ -614,7 +614,7 @@ int daemon_main(void)
        if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
                char pidbuf[16];
                int fd;
-               int pid = (int) getpid();
+               pid_t pid = getpid();
                cleanup_set_pid(pid);
                if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
                                        0666 & ~orig_umask)) == -1) {
@@ -622,7 +622,7 @@ int daemon_main(void)
                        rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
                        exit_cleanup(RERR_FILEIO);
                }
-               snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
                write(fd, pidbuf, strlen(pidbuf));
                close(fd);
        }