[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  7153200... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
       via  6a59db9... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
      from  7c8b346... Implementation of LDAP_SERVER_SD_FLAGS_OID on modify requests.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7153200f21e1f30ba0ca7d629cc2c4e187ba605f
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
    
    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

commit 6a59db9a2e4c1552bbdd1531b602661d6e199829
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 20 12:38:44 2009 +0100

    s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
    
    When idmap alloc backend is specified as
    idmap alloc 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:
 source3/winbindd/idmap_ldap.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 375c04a..cf32238 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -306,6 +306,8 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params)
 	}
 	CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
+	trim_char(idmap_alloc_ldap->url, '\"', '\"');
+
 	tmp = lp_parm_const_string(-1, "idmap alloc config",
 				   "ldap_base_dn", NULL);
 	if ( ! tmp || ! *tmp) {
@@ -854,6 +856,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