[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  67f1d0a... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
      from  fbaed41... s3: fixed krb5 build problem on ubuntu karmic

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 67f1d0ac6edecec4efb100ae61bc23bd321f518f
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 20 12:44:43 2009 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/idmap_ldap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/idmap_ldap.c b/source/winbindd/idmap_ldap.c
index 7a0e32b..ac5f7c8 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();


-- 
Samba Shared Repository