diff options
| -rw-r--r-- | docs-xml/smbdotconf/misc/widelinks.xml | 1 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 10 |
3 files changed, 2 insertions, 10 deletions
diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml index cb1389a37ac..09f8aa5c61e 100644 --- a/docs-xml/smbdotconf/misc/widelinks.xml +++ b/docs-xml/smbdotconf/misc/widelinks.xml @@ -1,7 +1,6 @@ <samba:parameter name="wide links" context="S" type="boolean" - generated_function="0" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para>This parameter controls whether or not links diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 867b8eb3e77..3f1c3c90b2c 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -238,7 +238,6 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; char *szCopy; \ char *szService; \ char *szInclude; \ - bool wide_links; \ bool bAvailable; \ struct parmlist_entry *param_opt; \ struct bitmap *copymap; \ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a2b827d12b2..8aedf225a60 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4296,19 +4296,13 @@ int lp_min_receive_file_size(void) even after a configuration file reload. ********************************************************************/ -static bool lp_widelinks_internal(int snum) -{ - return (bool)(LP_SNUM_OK(snum)? ServicePtrs[(snum)]->wide_links : - sDefault.wide_links); -} - void widelinks_warning(int snum) { if (lp_allow_insecure_wide_links()) { return; } - if (lp_unix_extensions() && lp_widelinks_internal(snum)) { + if (lp_unix_extensions() && lp_wide_links(snum)) { DEBUG(0,("Share '%s' has wide links and unix extensions enabled. " "These parameters are incompatible. " "Wide links will be disabled for this share.\n", @@ -4329,7 +4323,7 @@ bool lp_widelinks(int snum) } } - return lp_widelinks_internal(snum); + return lp_wide_links(snum); } int lp_server_role(void) |