smbdotconf: mark "mangling method" with constant="1"

From the manpage:

  ... controls the algorithm used for the generating
  the mangled names. Can take two different values, "hash" and
  "hash2". ...

No need for variable substitution support in this option, declare it const.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml
index 559ed6c9a790de3c283614a54a6a599e7dbffc1d..ef3a59b33bf48a82c2e72fb6fef7f6847b3e8e12 100644 (file)
--- a/docs-xml/smbdotconf/filename/manglingmethod.xml
+++ b/docs-xml/smbdotconf/filename/manglingmethod.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="mangling method"
                  context="G"
                  type="string"
 <samba:parameter name="mangling method"
                  context="G"
                  type="string"

+                 constant="1"

                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para> controls the algorithm used for the generating
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para> controls the algorithm used for the generating

diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 3649bf772fa629a227e29eb9cea4eb556e5acfa3..dbb187abb3bdac3e50858d3ec90f4a2db5ac317c 100644 (file)
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -45,7 +45,7 @@ static void mangle_init(void)
        if (mangle_fns)
                return;
 
        if (mangle_fns)
                return;
 

-       method = lp_mangling_method(talloc_tos());
+       method = lp_mangling_method();

 
        /* find the first mangling method that manages to initialise and
           matches the "mangling method" parameter */
 
        /* find the first mangling method that manages to initialise and
           matches the "mangling method" parameter */