X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/34937987a6ec0ab6d0585c650c2d7114f8929b4b..aca5500aea3c056f48e14e047288d905b30f392c:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 4b4a08f9..b3d3ceb2 100644 --- a/clientserver.c +++ b/clientserver.c @@ -28,6 +28,7 @@ #include "rsync.h" extern int verbose; +extern int quiet; extern int list_only; extern int am_sender; extern int am_server; @@ -46,10 +47,11 @@ extern int no_detach; extern int default_af_hint; extern char *bind_address; extern char *sockopts; -extern struct filter_list_struct server_filter_list; extern char *config_file; extern char *files_from; extern char *tmpdir; +extern struct chmod_mode_struct *chmod_modes; +extern struct filter_list_struct server_filter_list; char *auth_user; int read_only = 0; @@ -618,6 +620,7 @@ static int rsync_module(int f_in, int f_out, int i) verbose = 0; /* future verbosity is controlled by client options */ ret = parse_arguments(&argc, (const char ***) &argv, 0); + quiet = 0; /* Don't let someone try to be tricky. */ if (filesfrom_fd == 0) filesfrom_fd = f_in; @@ -682,6 +685,16 @@ static int rsync_module(int f_in, int f_out, int i) if (lp_timeout(i) && lp_timeout(i) > io_timeout) set_io_timeout(lp_timeout(i)); + + if (am_sender) + p = lp_outgoing_chmod(i); + else + p = lp_incoming_chmod(i); + if (*p && !parse_chmod(p, &chmod_modes)) { + rprintf(FLOG, "Invalid \"%sing chmod\" directive: %s\n", + am_sender ? "outgo" : "incom", p); + } + start_server(f_in, f_out, argc, argv); return 0;