smbdotconf: mark "ldap user suffix" with constant="1"

Due to the use of append_ldap_suffix() where Globals.ldap_suffix is returned
directly, variable substitution isn't supported anyway, so we can just mark this
const.

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

diff --git a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
index 8e6b8a340e4af9529023732ffc0a4ccf5c08783f..85bece3601f36a66b4b0863b2256142d2328c46a 100644 (file)
--- a/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
+++ b/docs-xml/smbdotconf/ldap/ldapusersuffix.xml
@@ -2,6 +2,7 @@
                  context="G"
                  type="string"
                  function="_ldap_user_suffix"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
        <para>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d3b503e32979ea06c1366fc4ca9e561a2abc9cb0..0249c7f2b747ed9b281849ceb94ae5b09e312f3a 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2604,7 +2604,7 @@ const char *lp_ldap_user_suffix(TALLOC_CTX *ctx)
        if (Globals._ldap_user_suffix[0])
                return append_ldap_suffix(ctx, Globals._ldap_user_suffix);
 
-       return lp_string(ctx, Globals.ldap_suffix);
+       return talloc_strdup(ctx, Globals.ldap_suffix);
 }
 
 const char *lp_ldap_group_suffix(TALLOC_CTX *ctx)