summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-11-20 12:44:43 +0100
committerKarolin Seeger <kseeger@samba.org>2010-01-13 14:00:55 +0100
commita52476b2beb464ccb33f4ce263ab061885bcc5f4 (patch)
treee408054632d838b571610055151e393ee91b0923 /source
parent3e5e42dd3fcefb481fc2d3fd71f9ca5fd0b1aa03 (diff)
downloadsamba-a52476b2beb464ccb33f4ce263ab061885bcc5f4.tar.gz
samba-a52476b2beb464ccb33f4ce263ab061885bcc5f4.tar.xz
samba-a52476b2beb464ccb33f4ce263ab061885bcc5f4.zip
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)
Diffstat (limited to 'source')
-rw-r--r--source/winbindd/idmap_ldap.c2
1 files changed, 2 insertions, 0 deletions
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();