param: turn 'wide links' into a generated funcion

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml
index cb1389a37ac03966e39e8a5238510488f6001936..09f8aa5c61e8bcb562f0693499a2613afd36560b 100644 (file)
--- 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 867b8eb3e774176e836113afe80350a0f9aadda5..3f1c3c90b2c03a0543a835579b0a8dacba8ac1b6 100644 (file)
--- 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 a2b827d12b2c993a6dc4f5052381f1d741fa39f1..8aedf225a606f95128c5c3e80e7e4dcf66de5569 100644 (file)
--- 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)