From: Michael Adam <obnox@samba.org>
Date: Wed, 2 Mar 2011 16:04:59 +0000 (+0100)
Subject: s3:idmap: remove use of params from idmap_ldap_init - it is not used any more
X-Git-Tag: ldb-1.1.0~629
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7511f080b459a5477362eeb6a326ed73e38a1b11;p=thirdparty%2Fsamba.git

s3:idmap: remove use of params from idmap_ldap_init - it is not used any more
---

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index aaac75f1010..eb3e67de824 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -461,21 +461,15 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
 		}
 	}
 
-	if (params != NULL) {
-		/* assume location is the only parameter */
-		ctx->url = talloc_strdup(ctx, params);
-	} else {
-		tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL);
+	tmp = lp_parm_const_string(-1, config_option, "ldap_url", NULL);
 
-		if ( ! tmp) {
-			DEBUG(1, ("ERROR: missing idmap ldap url\n"));
-			ret = NT_STATUS_UNSUCCESSFUL;
-			goto done;
-		}
-
-		ctx->url = talloc_strdup(ctx, tmp);
+	if ( ! tmp) {
+		DEBUG(1, ("ERROR: missing idmap ldap url\n"));
+		ret = NT_STATUS_UNSUCCESSFUL;
+		goto done;
 	}
-	CHECK_ALLOC_DONE(ctx->url);
+
+	ctx->url = talloc_strdup(ctx, tmp);
 
 	trim_char(ctx->url, '\"', '\"');