aboutsummaryrefslogtreecommitdiffstats
path: root/options.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-03-16 12:11:19 -0700
committerWayne Davison <wayned@samba.org>2008-03-16 12:11:19 -0700
commit2357a51e098d3b0f7ff6dfceac37ea42b3c32338 (patch)
tree33db1c7a841c706beab16418fa6149df4167c09d /options.c
parent24ded29ff63d0adee798936ad20f21befcf8187b (diff)
downloadandroid_external_rsync-2357a51e098d3b0f7ff6dfceac37ea42b3c32338.tar.gz
android_external_rsync-2357a51e098d3b0f7ff6dfceac37ea42b3c32338.tar.bz2
android_external_rsync-2357a51e098d3b0f7ff6dfceac37ea42b3c32338.zip
A daemon no longer tries to refuse the iconv option when it is not enabled.
Diffstat (limited to 'options.c')
-rw-r--r--options.c2
1 files changed, 2 insertions, 0 deletions
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