Attachment 4968 Details for Bug 6910 – Patchset for 3.4.

[patch] Patchset for 3.4.

samba-3.4-fix-idmap-config.patch (text/plain), 2.07 KB, created by Michael Adam on 2009-11-20 07:26:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2009-11-20 07:26:40 UTC

Size: 2.07 KB

patch

obsolete

>From b90ebad73a50c2032fcc9c66d1d2c06874e6541b Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 20 Nov 2009 12:38:44 +0100
>Subject: [PATCH] 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
>---
> source3/winbindd/idmap_ldap.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
>index 3d1dd48..eba030c 100644
>--- a/source3/winbindd/idmap_ldap.c
>+++ b/source3/winbindd/idmap_ldap.c
>@@ -305,6 +305,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) {
>-- 
>1.6.0.4
>
>
>From f700cb774728be410015c9408b459b60b92d272e Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Fri, 20 Nov 2009 12:44:43 +0100
>Subject: [PATCH] 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
>---
> source3/winbindd/idmap_ldap.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
>diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
>index eba030c..cdab0f0 100644
>--- a/source3/winbindd/idmap_ldap.c
>+++ b/source3/winbindd/idmap_ldap.c
>@@ -855,6 +855,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();
>-- 
>1.6.0.4
>

Flags:

vl: review+

Actions: View

Attachments on bug 6910: 4968 | 4979