git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24ded29
)
A daemon no longer tries to refuse the iconv option when it is not enabled.
author
Wayne Davison
<wayned@samba.org>
Sun, 16 Mar 2008 19:11:19 +0000
(12:11 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sun, 16 Mar 2008 19:11:19 +0000
(12:11 -0700)
options.c
patch
|
blob
|
history
diff --git
a/options.c
b/options.c
index d1e1ff672ec962a5c1f7e8b2101d2eda9d7608ec..ac34a5c3115f1e36c1531ecbb316fe7863970e15 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