From: Volker Lendecke <vl@samba.org>
Date: Sat, 7 Jan 2017 14:55:41 +0000 (+0000)
Subject: winbind: Use idmap_config_const_string in domain_has_idmap_config
X-Git-Tag: tdb-1.3.13~432
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8e00f01833daa2636f308f7fa8ce44700f0e579;p=thirdparty%2Fsamba.git

winbind: Use idmap_config_const_string in domain_has_idmap_config

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index a8a71362c28..9978e10b499 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -196,7 +196,6 @@ const char *idmap_config_const_string(const char *domname, const char *option,
 bool domain_has_idmap_config(const char *domname)
 {
 	int i;
-	char *config_option;
 	const char *range = NULL;
 	const char *backend = NULL;
 	bool ok;
@@ -214,23 +213,14 @@ bool domain_has_idmap_config(const char *domname)
 
 	/* fallback: also check loadparm */
 
-	config_option = talloc_asprintf(talloc_tos(), "idmap config %s",
-					domname);
-	if (config_option == NULL) {
-		DEBUG(0, ("out of memory\n"));
-		return false;
-	}
-
-	range = lp_parm_const_string(-1, config_option, "range", NULL);
-	backend = lp_parm_const_string(-1, config_option, "backend", NULL);
+	range = idmap_config_const_string(domname, "range", NULL);
+	backend = idmap_config_const_string(domname, "backend", NULL);
 	if (range != NULL && backend != NULL) {
 		DEBUG(5, ("idmap configuration specified for domain '%s'\n",
 			domname));
-		TALLOC_FREE(config_option);
 		return true;
 	}
 
-	TALLOC_FREE(config_option);
 	return false;
 }