Attachment 4377 Details for Bug 6431 – Patch for master and 3.4.

[patch] Patch for master and 3.4.

look (text/plain), 2.92 KB, created by Jeremy Allison on 2009-06-30 13:29:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2009-06-30 13:29:08 UTC

Size: 2.92 KB

patch

obsolete

>diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>index 5cbe675..0886a10 100644
>--- a/source3/passdb/pdb_ldap.c
>+++ b/source3/passdb/pdb_ldap.c
>@@ -2297,7 +2297,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);
> 
>@@ -2617,7 +2617,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);
> 
>@@ -2865,7 +2865,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)
>@@ -3323,7 +3323,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);
>@@ -3332,7 +3332,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);
>@@ -3722,7 +3722,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)
>@@ -4078,7 +4078,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);
>@@ -4680,7 +4680,7 @@ static bool ldapsam_search_grouptype(struct pdb_methods *methods,
> 
> 	state->connection = ldap_state->smbldap_state;
> 
>-	state->base = talloc_strdup(search, lp_ldap_group_suffix());
>+	state->base = talloc_strdup(search, lp_ldap_suffix());
> 	state->connection = ldap_state->smbldap_state;
> 	state->scope = LDAP_SCOPE_SUBTREE;
> 	state->filter =	talloc_asprintf(search, "(&(objectclass=%s)"

Actions: View

Attachments on bug 6431: 4237 | 4377