Added RERR_VANISHED.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index a56a792..5c931fa 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -34,6 +34,10 @@ extern int rsync_port;
 char *auth_user;
 extern int sanitize_paths;
 extern int filesfrom_fd;
+extern int remote_protocol;
+extern int protocol_version;
+extern struct exclude_struct **server_exclude_list;
+extern char *exclude_path_prefix;
 
 /**
  * Run a client connected to an rsyncd.  The alternative to this
@@ -78,8 +82,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                rprintf(FINFO, "opening tcp connection to %s port %d\n",
                        host, rsync_port);
        }
-       fd = open_socket_out_wrapped (host, rsync_port, bind_address,
-                                               default_af_hint);
+       fd = open_socket_out_wrapped(host, rsync_port, bind_address,
+                                    default_af_hint);
        if (fd == -1) {
                exit_cleanup(RERR_SOCKETIO);
        }
@@ -96,7 +100,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;
@@ -133,12 +136,14 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
                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;
@@ -147,7 +152,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)) {
@@ -186,8 +191,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 || (protocol_version > 17 && !am_sender))
                        io_start_multiplex_in(f_in);
        }
 
@@ -215,7 +220,6 @@ static int rsync_module(int f_in, int f_out, int i)
        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))) {
@@ -240,7 +244,8 @@ static int rsync_module(int f_in, int f_out, int i)
                } else {
                        rprintf(FERROR,"max connections (%d) reached\n",
                                lp_max_connections(i));
-                       io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
+                       io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+                               lp_max_connections(i));
                }
                return -1;
        }
@@ -288,17 +293,23 @@ static int rsync_module(int f_in, int f_out, int i)
        /* TODO: Perhaps take a list of gids, and make them into the
         * 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(p, 1, 1);
+       add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
 
        p = lp_include(i);
-       add_include_line(p);
+       add_exclude_line(&server_exclude_list, p, ADD_INCLUDE);
 
        p = lp_exclude_from(i);
-       add_exclude_file(p, 1, 0);
+       add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE);
 
        p = lp_exclude(i);
-       add_exclude_line(p);
+       add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE);
+
+       exclude_path_prefix = NULL;
 
        log_init();
 
@@ -337,16 +348,6 @@ static int rsync_module(int f_in, int f_out, int i)
        }
 
        if (am_root) {
-#ifdef HAVE_SETGROUPS
-               /* Get rid of any supplementary groups this process
-                * might have inheristed. */
-               if (setgroups(0, NULL)) {
-                       rsyserr(FERROR, errno, "setgroups failed");
-                       io_printf(f_out, "@ERROR: setgroups failed\n");
-                       return -1;
-               }
-#endif
-
                /* XXXX: You could argue that if the daemon is started
                 * by a non-root user and they explicitly specify a
                 * gid, then we should try to change to that gid --
@@ -362,6 +363,15 @@ static int rsync_module(int f_in, int f_out, int i)
                        io_printf(f_out, "@ERROR: setgid failed\n");
                        return -1;
                }
+#ifdef HAVE_SETGROUPS
+               /* Get rid of any supplementary groups this process
+                * might have inheristed. */
+               if (setgroups(1, &gid)) {
+                       rsyserr(FERROR, errno, "setgroups failed");
+                       io_printf(f_out, "@ERROR: setgroups failed\n");
+                       return -1;
+               }
+#endif
 
                if (setuid(uid)) {
                        rsyserr(FERROR, errno, "setuid %d failed", (int) uid);
@@ -446,8 +456,8 @@ static int rsync_module(int f_in, int f_out, int i)
        if (verbose > 1) verbose = 1;
 #endif
 
-       if (remote_version < 23) {
-               if (remote_version == 22 || (remote_version > 17 && am_sender))
+       if (protocol_version < 23) {
+               if (protocol_version == 22 || (protocol_version > 17 && am_sender))
                        io_start_multiplex_out(f_out);
        }
 
@@ -480,13 +490,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");
 }
 
@@ -499,7 +508,6 @@ int start_daemon(int f_in, int f_out)
        char *motd;
        int i = -1;
        extern char *config_file;
-       extern int remote_version;
        extern int am_server;
 
        if (!lp_load(config_file, 0)) {
@@ -534,10 +542,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;
@@ -622,4 +632,3 @@ int daemon_main(void)
        start_accept_loop(rsync_port, start_daemon);
        return -1;
 }
-