From: Wayne Davison <wayned@samba.org>
Date: Sun, 16 Mar 2008 19:11:19 +0000 (-0700)
Subject: A daemon no longer tries to refuse the iconv option when it is not enabled.
X-Git-Tag: v3.0.1pre1~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2357a51e098d3b0f7ff6dfceac37ea42b3c32338;p=thirdparty%2Frsync.git

A daemon no longer tries to refuse the iconv option when it is not enabled.
---

diff --git a/options.c b/options.c
index d1e1ff67..ac34a5c3 100644
--- a/options.c
+++ b/options.c
@@ -902,8 +902,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		set_refuse_options(ref);
 	if (am_daemon) {
 		set_refuse_options("log-file*");
+#ifdef ICONV_OPTION
 		if (!*lp_charset(module_id))
 			set_refuse_options("iconv");
+#endif
 	}
 
 #ifdef ICONV_OPTION