X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4a7144ee7e4cca2a28b484da1458ba89f022bb33..22d49dc429f18b5cccf0f237dfd95cceb0b48367:/clientserver.c diff --git a/clientserver.c b/clientserver.c index a56a792c..a2bbfe87 100644 --- a/clientserver.c +++ b/clientserver.c @@ -27,13 +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 @@ -53,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 @@ -78,8 +94,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,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; @@ -126,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; @@ -147,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)) { @@ -186,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); } @@ -212,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", @@ -240,7 +248,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 +297,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(); @@ -321,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; @@ -337,16 +352,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 +367,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 +460,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 || am_sender) io_start_multiplex_out(f_out); } @@ -465,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); } @@ -480,13 +493,12 @@ static void send_listing(int fd) { int n = lp_numservices(); int i; - extern int remote_version; for (i=0;i= 25) + if (protocol_version >= 25) io_printf(fd,"@RSYNCD: EXIT\n"); } @@ -498,9 +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 remote_version; - extern int am_server; if (!lp_load(config_file, 0)) { exit_cleanup(RERR_SYNTAX); @@ -514,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) { @@ -534,10 +543,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; @@ -569,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; @@ -606,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) { @@ -614,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); } @@ -622,4 +630,3 @@ int daemon_main(void) start_accept_loop(rsync_port, start_daemon); return -1; } -