From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 18 May 2020 06:26:13 +0000 (-0700)
Subject: Add back a lost "*" and document the refusing of log-file* opts.
X-Git-Tag: v3.2.0pre1~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b36bde9536614737bb73eaac5aa1e9c039472a3;p=thirdparty%2Frsync.git

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

diff --git a/options.c b/options.c
index ebf31a60..32871fd5 100644
--- a/options.c
+++ b/options.c
@@ -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. */
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 15b1b44c..08d198a1 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -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: