A daemon no longer tries to refuse the iconv option when it is not enabled.
authorWayne Davison <wayned@samba.org>
Sun, 16 Mar 2008 19:11:19 +0000 (12:11 -0700)
committerWayne Davison <wayned@samba.org>
Sun, 16 Mar 2008 19:11:19 +0000 (12:11 -0700)
options.c

index d1e1ff6..ac34a5c 100644 (file)
--- 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