From: Ralph Boehme <slow@samba.org>
Date: Tue, 5 Nov 2019 09:53:54 +0000 (+0100)
Subject: smbdotconf: mark "mangling method" with constant="1"
X-Git-Tag: ldb-2.1.0~514
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=564b0b5be31593de01e6d53388ee69e48645effa;p=thirdparty%2Fsamba.git

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 559ed6c9a79..ef3a59b33bf 100644
--- 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"
+                 constant="1"
                  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 3649bf772fa..dbb187abb3b 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -45,7 +45,7 @@ static void mangle_init(void)
 	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 */