From rsync-cvs at lists.samba.org Thu Jan 5 05:55:45 2023 From: rsync-cvs at lists.samba.org (Rsync CVS commit messages) Date: Thu, 05 Jan 2023 05:55:45 +0000 Subject: [SCM] The rsync repository. - branch master updated Message-ID: The branch, master has been updated via 5c93dedf Add backtick to SHELL_CHARS. via f1e3434b Trust the sender on a local transfer. via 48252c3c A couple manpage links. from 5b67ff2a Improve [global] module documentation. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5c93dedf4538426982f8832fa9103f09a78a01ad Author: Wayne Davison Date: Wed Jan 4 21:52:48 2023 -0800 Add backtick to SHELL_CHARS. commit f1e3434b59dd3dfbf4b6faf8dbc81dd068adc305 Author: Wayne Davison Date: Thu Dec 1 20:16:51 2022 -0800 Trust the sender on a local transfer. commit 48252c3c2bc0b1a375137dd91932122d6ee82a8a Author: Wayne Davison Date: Wed Nov 23 07:58:43 2022 -0800 A couple manpage links. ----------------------------------------------------------------------- Summary of changes: main.c | 6 +++++- options.c | 2 +- rsyncd.conf.5.md | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/main.c b/main.c index 9f36904d..0c60b86d 100644 --- a/main.c +++ b/main.c @@ -89,6 +89,8 @@ extern int backup_dir_len; extern int basis_dir_cnt; extern int default_af_hint; extern int stdout_format_has_i; +extern int trust_sender_filter; +extern int trust_sender_args; extern struct stats stats; extern char *stdout_format; extern char *logfile_format; @@ -1471,8 +1473,10 @@ static int start_client(int argc, char *argv[]) } /* A local transfer doesn't unbackslash anything, so leave the args alone. */ - if (local_server) + if (local_server) { old_style_args = 2; + trust_sender_args = trust_sender_filter = 1; + } if (!rsync_port && remote_argc && !**remote_argv) /* Turn an empty arg into a dot dir. */ *remote_argv = "."; diff --git a/options.c b/options.c index ded0e7a3..c9c82527 100644 --- a/options.c +++ b/options.c @@ -2518,7 +2518,7 @@ static char SPLIT_ARG_WHEN_OLD[1]; **/ char *safe_arg(const char *opt, const char *arg) { -#define SHELL_CHARS "!#$&;|<>(){}\"' \t\\" +#define SHELL_CHARS "!#$&;|<>(){}\"'` \t\\" #define WILD_CHARS "*?[]" /* We don't allow remote brace expansion */ BOOL is_filename_arg = !opt; char *escapes = is_filename_arg ? SHELL_CHARS : WILD_CHARS SHELL_CHARS; diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md index 8ebbf87f..3d91cd93 100644 --- a/rsyncd.conf.5.md +++ b/rsyncd.conf.5.md @@ -120,9 +120,9 @@ parameters: You can override the default backlog value when the daemon listens for connections. It defaults to 5. -You may also include any module parameters in the global part of the config -file, in which case the supplied value will override the default for that -parameter. +You may also include any [MODULE PARAMETERS](#) in the global part of the +config file, in which case the supplied value will override the default for +that parameter. You may use references to environment variables in the values of parameters. String parameters will have %VAR% references expanded as late as possible (when @@ -153,8 +153,8 @@ parameters as a combination of the default values that are set at that position in the config file plus its own parameter list, the use of a "[global]" section can help to maintain shared config values for multiple modules. -As with GLOBAL PARAMETERS, you may use references to environment variables in -the values of parameters. See the GLOBAL PARAMETERS section for more details. +As with [GLOBAL PARAMETERS](#), you may use references to environment variables +in the values of parameters. See that section for details. 0. `comment` -- The rsync repository.