Attachment 4237 Details for Bug 6431 – patch for the problem

[patch] patch for the problem

0001-Search-for-groups-without-group-suffix-group-suffix.patch (text/plain), 3.28 KB, created by Björn Jacke on 2009-06-02 09:05:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2009-06-02 09:05:59 UTC

Size: 3.28 KB

patch

obsolete

>From e5157d3c945b776752aeb6b4bc66c038493507b4 Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 7 May 2009 14:54:17 +0200
>Subject: [PATCH] Search for groups without group suffix, group suffix is only used for new entries
>
>---
> source/passdb/pdb_ldap.c |   16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
>index 0d54fe0..6c0a968 100644
>--- a/source/passdb/pdb_ldap.c
>+++ b/source/passdb/pdb_ldap.c
>@@ -2306,7 +2306,7 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state,
> 
> 	attr_list = get_attr_list(NULL, groupmap_attr_list);
> 	rc = smbldap_search(ldap_state->smbldap_state,
>-			    lp_ldap_group_suffix (), scope,
>+			    lp_ldap_suffix (), scope,
> 			    filter, attr_list, 0, result);
> 	TALLOC_FREE(attr_list);
> 
>@@ -2626,7 +2626,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
> 		goto done;
> 	}
> 
>-	rc = smbldap_search(conn, lp_ldap_group_suffix(),
>+	rc = smbldap_search(conn, lp_ldap_suffix(),
> 			    LDAP_SCOPE_SUBTREE, filter, id_attrs, 0,
> 			    &result);
> 
>@@ -2875,7 +2875,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
> 		goto done;
> 	}
> 
>-	rc = smbldap_search(conn, lp_ldap_group_suffix(),
>+	rc = smbldap_search(conn, lp_ldap_suffix(),
> 			    LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
> 
> 	if (rc != LDAP_SUCCESS)
>@@ -3332,7 +3332,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
> 		return NT_STATUS_NO_MEMORY;
> 	}
> 	attr_list = get_attr_list( NULL, groupmap_attr_list );
>-	rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
>+	rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
> 			    LDAP_SCOPE_SUBTREE, filter,
> 			    attr_list, 0, &ldap_state->result);
> 	TALLOC_FREE(attr_list);
>@@ -3341,7 +3341,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
> 		DEBUG(0, ("ldapsam_setsamgrent: LDAP search failed: %s\n",
> 			  ldap_err2string(rc)));
> 		DEBUG(3, ("ldapsam_setsamgrent: Query was: %s, %s\n",
>-			  lp_ldap_group_suffix(), filter));
>+			  lp_ldap_suffix(), filter));
> 		ldap_msgfree(ldap_state->result);
> 		ldap_state->result = NULL;
> 		TALLOC_FREE(filter);
>@@ -3731,7 +3731,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
> 		return NT_STATUS_NO_MEMORY;
> 	}
> 
>-	rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
>+	rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
> 			    LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
> 
> 	if (rc != LDAP_SUCCESS)
>@@ -4087,7 +4087,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
> 		}
> 
> 		rc = smbldap_search(ldap_state->smbldap_state,
>-				    lp_ldap_group_suffix(),
>+				    lp_ldap_suffix(),
> 				    LDAP_SCOPE_SUBTREE, filter, ldap_attrs, 0,
> 				    &msg);
> 		talloc_autofree_ldapmsg(mem_ctx, msg);
>@@ -4660,7 +4660,7 @@ static bool ldapsam_search_grouptype(struct pdb_methods *methods,
> 
> 	state->connection = ldap_state->smbldap_state;
> 
>-	state->base = talloc_strdup(search->mem_ctx, lp_ldap_group_suffix());
>+	state->base = talloc_strdup(search->mem_ctx, lp_ldap_suffix());
> 	state->connection = ldap_state->smbldap_state;
> 	state->scope = LDAP_SCOPE_SUBTREE;
> 	state->filter =	talloc_asprintf(search->mem_ctx,
>-- 
>1.5.5
>

Actions: View

Attachments on bug 6431: 4237 | 4377