Got rid of unused string_area struct.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 7f85432..468553c 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -27,15 +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
@@ -55,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
@@ -98,11 +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 remote_version;
-       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;
@@ -128,19 +137,21 @@ 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");
                return -1;
        }
 
-       if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+       if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
                /* note that read_line strips of \n or \r */
                rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n",
                        line);
                return -1;
        }
+       if (protocol_version > remote_protocol)
+               protocol_version = remote_protocol;
 
        p = strchr(path,'/');
        if (p) *p = 0;
@@ -149,7 +160,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
 
        /* Old servers may just drop the connection here,
         rather than sending a proper EXIT command.  Yuck. */
-       kludge_around_eof = list_only && (remote_version < 25);
+       kludge_around_eof = list_only && (protocol_version < 25);
 
        while (1) {
                if (!read_line(f_in, line, sizeof(line)-1)) {
@@ -188,8 +199,8 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
        }
        io_printf(f_out, "\n");
 
-       if (remote_version < 23) {
-               if (remote_version == 22 || (remote_version > 17 && !am_sender))
+       if (protocol_version < 23) {
+               if (protocol_version == 22 || !am_sender)
                        io_start_multiplex_in(f_in);
        }
 
@@ -214,11 +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 remote_version;
-       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",
@@ -260,7 +266,7 @@ static int rsync_module(int f_in, int f_out, int i)
 
        module_id = i;
 
-       am_root = (getuid() == 0);
+       am_root = (MY_UID() == 0);
 
        if (am_root) {
                p = lp_uid(i);
@@ -292,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);
@@ -328,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;
@@ -375,7 +383,7 @@ static int rsync_module(int f_in, int f_out, int i)
                        return -1;
                }
 
-               am_root = (getuid() == 0);
+               am_root = (MY_UID() == 0);
        }
 
        io_printf(f_out, "@RSYNCD: OK\n");
@@ -449,11 +457,12 @@ static int rsync_module(int f_in, int f_out, int i)
 
 #ifndef DEBUG
        /* don't allow the logs to be flooded too fast */
-       if (verbose > 1) verbose = 1;
+       if (verbose > lp_max_verbosity())
+               verbose = lp_max_verbosity();
 #endif
 
-       if (remote_version < 23) {
-               if (remote_version == 22 || (remote_version > 17 && am_sender))
+       if (protocol_version < 23) {
+               if (protocol_version == 22 || am_sender)
                        io_start_multiplex_out(f_out);
        }
 
@@ -471,7 +480,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);
        }
 
@@ -486,13 +494,12 @@ static void send_listing(int fd)
 {
        int n = lp_numservices();
        int i;
-       extern int remote_version;
 
        for (i=0;i<n;i++)
                if (lp_list(i))
                        io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
 
-       if (remote_version >= 25)
+       if (protocol_version >= 25)
                io_printf(fd,"@RSYNCD: EXIT\n");
 }
 
@@ -504,9 +511,6 @@ int start_daemon(int f_in, int f_out)
        char line[200];
        char *motd;
        int i = -1;
-       extern char *config_file;
-       extern int remote_version;
-       extern int am_server;
 
        if (!lp_load(config_file, 0)) {
                exit_cleanup(RERR_SYNTAX);
@@ -520,7 +524,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) {
@@ -540,10 +544,12 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
 
-       if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+       if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
                io_printf(f_out, "@ERROR: protocol startup error\n");
                return -1;
        }
+       if (protocol_version > remote_protocol)
+               protocol_version = remote_protocol;
 
        while (i == -1) {
                line[0] = 0;
@@ -575,10 +581,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;
@@ -612,7 +615,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) {
@@ -620,7 +623,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);
        }