mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-30 19:15:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add back a lost "*" and document the refusing of log-file* opts.

Browse Source
This commit is contained in:
Wayne Davison
2020-05-17 23:26:13 -07:00
parent c3986d4c5a
commit 3b36bde953
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
options.c
View File

@@ -1143,7 +1143,7 @@ void option_error(void)
}
static void set_one_refuse_option(int negated, const char *ref, const struct poptOption *list_end)
static void parse_one_refuse_match(int negated, const char *ref, const struct poptOption *list_end)
{
struct poptOption *op;
char shortName[2];
@@ -1221,7 +1221,7 @@ static void set_refuse_options(void)
assert(list_end != NULL);
if (am_daemon) /* Refused by default, but can be accepted via "!write-devices" */
set_one_refuse_option(0, "write-devices", list_end);
parse_one_refuse_match(0, "write-devices", list_end);
while (1) {
while (*ref == ' ') ref++;
@@ -1232,7 +1232,7 @@ static void set_refuse_options(void)
negated = *ref == '!';
if (negated && ref[1])
ref++;
set_one_refuse_option(negated, ref, list_end);
parse_one_refuse_match(negated, ref, list_end);
if (!cp)
break;
*cp = ' ';
@@ -1242,9 +1242,9 @@ static void set_refuse_options(void)
if (am_daemon) {
#ifdef ICONV_OPTION
if (!*lp_charset(module_id))
set_one_refuse_option(0, "iconv", list_end);
parse_one_refuse_match(0, "iconv", list_end);
#endif
set_one_refuse_option(0, "log-file", list_end);
parse_one_refuse_match(0, "log-file*", list_end);
}
/* Now we use the descrip values to actually mark the options for refusal. */

3
rsyncd.conf.yo
View File

@@ -801,7 +801,8 @@ If you are un-refusing the compress option, you probably want to match
"!compress*" so that you also accept the bf(--compress-level) option.
Note that the "write-devices" option is refused by default, but can be
explicitly accepted with "!write-devices".
explicitly accepted with "!write-devices". The options "log-file" and
"log-file-format" are forcibly refused and cannot be accepted.
Here are all the options that are not matched by wild-cards: