From: Ralph Boehme <slow@samba.org>
Date: Mon, 4 Nov 2019 16:54:23 +0000 (+0100)
Subject: smbdotconf: mark "ldap admin dn" with constant="1"
X-Git-Tag: ldb-2.1.0~520
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=050c28364aa1b476d33ea726ecb6cbd9d26af5d8;p=thirdparty%2Fsamba.git

smbdotconf: mark "ldap admin dn" with constant="1"

All the other LDAP related options like "ldap user suffix" don't support
variable substitution, so I guess it's safe to remove support for it from this
one as well.

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

diff --git a/docs-xml/smbdotconf/ldap/ldapadmindn.xml b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
index 1f3d20f003a..5f5476b0f4c 100644
--- a/docs-xml/smbdotconf/ldap/ldapadmindn.xml
+++ b/docs-xml/smbdotconf/ldap/ldapadmindn.xml
@@ -1,6 +1,7 @@
 <samba:parameter name="ldap admin dn"
                  context="G"
                  type="string"
+                 constant="1"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index ce215b1f2b2..2b2206070e2 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -324,7 +324,7 @@ bool fetch_ldap_pw(char **dn, char** pw)
 	char *key = NULL;
 	size_t size = 0;
 
-	*dn = smb_xstrdup(lp_ldap_admin_dn(talloc_tos()));
+	*dn = smb_xstrdup(lp_ldap_admin_dn());
 
 	if (asprintf(&key, "%s/%s", SECRETS_LDAP_BIND_PW, *dn) < 0) {
 		SAFE_FREE(*dn);
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index a6509abe5cb..858689b3012 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -295,7 +295,7 @@ static bool store_ldap_admin_pw (char* pw)
 	if (!secrets_init())
 		return False;
 
-	return secrets_store_ldap_pw(lp_ldap_admin_dn(talloc_tos()), pw);
+	return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw);
 }
 
 
@@ -310,7 +310,7 @@ static int process_root(int local_flags)
 	char *old_passwd = NULL;
 
 	if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
-		char *ldap_admin_dn = lp_ldap_admin_dn(talloc_tos());
+		const char *ldap_admin_dn = lp_ldap_admin_dn();
 		if ( ! *ldap_admin_dn ) {
 			DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n"));
 			goto done;