From: Michael Adam <obnox@samba.org>
Date: Fri, 20 Nov 2009 11:44:43 +0000 (+0100)
Subject: s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
X-Git-Tag: samba-3.3.10~38
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=a52476b2beb464ccb33f4ce263ab061885bcc5f4

s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init

Fix bug #6910 (idmap_ldap stumbles over idmap backend = ldap:"ldap://ldap1
ldap://ldap2"=.

When idmap backend is specified as
idmap backend = ldap:"ldap://server1 ldap://server2"
then currently "ldap://server1 ldap://server2" was passed to
ldap_initialize including the quotes, leading to an ldap error.

Michael
(cherry picked from commit 67f1d0ac6edecec4efb100ae61bc23bd321f518f)
---

diff --git a/source/winbindd/idmap_ldap.c b/source/winbindd/idmap_ldap.c
index 7a0e32b769a..ac5f7c8845d 100644
--- a/source/winbindd/idmap_ldap.c
+++ b/source/winbindd/idmap_ldap.c
@@ -853,6 +853,8 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom,
 	}
 	CHECK_ALLOC_DONE(ctx->url);
 
+	trim_char(ctx->url, '\"', '\"');
+
         tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
         if ( ! tmp || ! *tmp) {
                 tmp = lp_ldap_idmap_suffix();