X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/33e9d10d2a69a625be4746a166f3fe319b05b757..6fb812f747e0613a1a33436d34c0db4752ea5f70:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 1b391ec9..9f514062 100644 --- a/clientserver.c +++ b/clientserver.c @@ -47,7 +47,7 @@ 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 struct exclude_list_struct server_exclude_list; extern char *exclude_path_prefix; extern char *config_file; @@ -70,7 +70,7 @@ char *auth_user; int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, ret; - char *p, *user=NULL; + char *p, *user = NULL; /* this is redundant with code in start_inband_exchange(), but * this short-circuits a problem before we open a socket, and @@ -87,18 +87,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) *p = 0; } - if (verbose >= 2) { - /* FIXME: If we're going to use a socket program for - * testing, then this message is wrong. We need to - * say something like "(except really using %s)" */ - 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); - if (fd == -1) { + if (fd == -1) exit_cleanup(RERR_SOCKETIO); - } ret = start_inband_exchange(user, path, fd, fd, argc); @@ -121,8 +113,10 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) return -1; } - if (!user) user = getenv("USER"); - if (!user) user = getenv("LOGNAME"); + if (!user) + user = getenv("USER"); + if (!user) + user = getenv("LOGNAME"); /* set daemon_over_rsh to false since we need to build the * true set of args passed through the rsh/ssh connection; @@ -139,7 +133,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) io_printf(f_out, "@RSYNCD: %d\n", protocol_version); - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) { rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; } @@ -163,7 +157,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) kludge_around_eof = list_only && (protocol_version < 25); while (1) { - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) { rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -173,7 +167,8 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) continue; } - if (strcmp(line,"@RSYNCD: OK") == 0) break; + if (strcmp(line,"@RSYNCD: OK") == 0) + break; if (strcmp(line,"@RSYNCD: EXIT") == 0) { /* This is sent by recent versions of the @@ -211,7 +206,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) static int rsync_module(int f_in, int f_out, int i) { - int argc=0; + int argc = 0; char *argv[MAX_ARGS]; char **argp; char line[MAXPATHLEN]; @@ -222,9 +217,9 @@ static int rsync_module(int f_in, int f_out, int i) char *host = client_name(f_in); char *name = lp_name(i); int use_chroot = lp_use_chroot(i); - int start_glob=0; + int start_glob = 0; int ret; - char *request=NULL; + char *request = NULL; if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { rprintf(FERROR,"rsync denied on module %s from %s (%s)\n", @@ -235,16 +230,16 @@ static int rsync_module(int f_in, int f_out, int i) } if (am_daemon && am_server) { - rprintf(FINFO, "rsync allowed access on module %s from %s (%s)\n", + rprintf(FLOG, "rsync allowed access on module %s from %s (%s)\n", name, host, addr); } if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) { if (errno) { - rprintf(FERROR,"failed to open lock file %s : %s\n", - lp_lock_file(i), strerror(errno)); - io_printf(f_out, "@ERROR: failed to open lock file %s : %s\n", - lp_lock_file(i), strerror(errno)); + rsyserr(FERROR, errno, "failed to open lock file %s", + lp_lock_file(i)); + io_printf(f_out, "@ERROR: failed to open lock file %s\n", + lp_lock_file(i)); } else { rprintf(FERROR,"max connections (%d) reached\n", lp_max_connections(i)); @@ -254,7 +249,6 @@ static int rsync_module(int f_in, int f_out, int i) return -1; } - auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD "); if (!auth_user) { @@ -266,12 +260,12 @@ 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); if (!name_to_uid(p, &uid)) { - if (!isdigit(* (unsigned char *) p)) { + if (!isdigit(*(unsigned char *)p)) { rprintf(FERROR,"Invalid uid %s\n", p); io_printf(f_out, "@ERROR: invalid uid %s\n", p); return -1; @@ -281,7 +275,7 @@ static int rsync_module(int f_in, int f_out, int i) p = lp_gid(i); if (!name_to_gid(p, &gid)) { - if (!isdigit(* (unsigned char *) p)) { + if (!isdigit(*(unsigned char *)p)) { rprintf(FERROR,"Invalid gid %s\n", p); io_printf(f_out, "@ERROR: invalid gid %s\n", p); return -1; @@ -302,16 +296,19 @@ static int rsync_module(int f_in, int f_out, int i) exclude_path_prefix = ""; p = lp_include_from(i); - add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE); + add_exclude_file(&server_exclude_list, p, + XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE); p = lp_include(i); - add_exclude_line(&server_exclude_list, p, ADD_INCLUDE); + add_exclude(&server_exclude_list, p, + XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE); p = lp_exclude_from(i); - add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE); + add_exclude_file(&server_exclude_list, p, + XFLG_FATAL_ERRORS); p = lp_exclude(i); - add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE); + add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT); exclude_path_prefix = NULL; @@ -363,7 +360,7 @@ static int rsync_module(int f_in, int f_out, int i) * all their supplementary groups. */ if (setgid(gid)) { - rsyserr(FERROR, errno, "setgid %d failed", (int) gid); + rsyserr(FERROR, errno, "setgid %d failed", (int)gid); io_printf(f_out, "@ERROR: setgid failed\n"); return -1; } @@ -378,12 +375,12 @@ static int rsync_module(int f_in, int f_out, int i) #endif if (setuid(uid)) { - rsyserr(FERROR, errno, "setuid %d failed", (int) uid); + rsyserr(FERROR, errno, "setuid %d failed", (int)uid); io_printf(f_out, "@ERROR: setuid failed\n"); return -1; } - am_root = (getuid() == 0); + am_root = (MY_UID() == 0); } io_printf(f_out, "@RSYNCD: OK\n"); @@ -391,18 +388,16 @@ static int rsync_module(int f_in, int f_out, int i) argv[argc++] = "rsyncd"; while (1) { - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) return -1; - } - if (!*line) break; + if (!*line) + break; p = line; - argv[argc] = strdup(p); - if (!argv[argc]) { + if (!(argv[argc] = strdup(p))) return -1; - } if (start_glob) { if (start_glob == 1) { @@ -410,30 +405,14 @@ static int rsync_module(int f_in, int f_out, int i) start_glob++; } glob_expand(name, argv, &argc, MAX_ARGS); - } else { + } else argc++; - } - if (strcmp(line,".") == 0) { + if (strcmp(line, ".") == 0) start_glob = 1; - } - if (argc == MAX_ARGS) { + if (argc == MAX_ARGS) return -1; - } - } - - if (sanitize_paths) { - /* - * Note that this is applied to all parameters, whether or not - * they are filenames, but no other legal parameters contain - * the forms that need to be sanitized so it doesn't hurt; - * it is not known at this point which parameters are files - * and which aren't. - */ - for (i = 1; i < argc; i++) { - sanitize_path(argv[i], NULL); - } } argp = argv; @@ -444,12 +423,12 @@ static int rsync_module(int f_in, int f_out, int i) if (request) { if (*auth_user) { - rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n", - am_sender?"on":"to", + rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n", + am_sender ? "on" : "to", request, auth_user, host, addr); } else { - rprintf(FINFO,"rsync %s %s from %s (%s)\n", - am_sender?"on":"to", + rprintf(FLOG, "rsync %s %s from %s (%s)\n", + am_sender ? "on" : "to", request, host, addr); } free(request); @@ -479,9 +458,8 @@ static int rsync_module(int f_in, int f_out, int i) exit_cleanup(RERR_UNSUPPORTED); } - if (lp_timeout(i)) { + if (lp_timeout(i)) io_timeout = lp_timeout(i); - } start_server(f_in, f_out, argc, argp); @@ -495,7 +473,7 @@ static void send_listing(int fd) int n = lp_numservices(); int i; - for (i=0;i 0) { line[len] = 0; io_printf(f_out, "%s", line); } } - if (f) fclose(f); + if (f) + fclose(f); io_printf(f_out, "\n"); } - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) return -1; - } if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) { io_printf(f_out, "@ERROR: protocol startup error\n"); @@ -553,11 +530,10 @@ int start_daemon(int f_in, int f_out) while (i == -1) { line[0] = 0; - if (!read_line(f_in, line, sizeof(line)-1)) { + if (!read_line(f_in, line, sizeof line - 1)) return -1; - } - if (!*line || strcmp(line,"#list")==0) { + if (!*line || strcmp(line,"#list") == 0) { send_listing(f_out); return -1; } @@ -589,7 +565,7 @@ int daemon_main(void) /* we are running via inetd - close off stdout and * stderr so that library functions (and getopt) don't * try to use them. Redirect them to /dev/null */ - for (i=1;i<3;i++) { + for (i = 1; i < 3; i++) { close(i); open("/dev/null", O_RDWR); } @@ -600,13 +576,12 @@ int daemon_main(void) if (!no_detach) become_daemon(); - if (!lp_load(config_file, 1)) { + if (!lp_load(config_file, 1)) exit_cleanup(RERR_SYNTAX); - } log_init(); - rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", + rprintf(FLOG, "rsyncd version %s starting, listening on port %d\n", RSYNC_VERSION, rsync_port); /* TODO: If listening on a particular address, then show that * address too. In fact, why not just do inet_ntop on the