diff options
author | Volker Lendecke <vl@samba.org> | 2009-06-30 11:42:15 -0700 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-07-03 13:21:14 +0200 |
commit | 51b334e2d9739abc748490f6085ed8b8e5e1f4b4 (patch) | |
tree | 8d263aa475cd9cfb97acd3890ef1ddfcd246183b | |
parent | 7907d399ed0110072ff39ed1f8edccbbad531bfd (diff) | |
download | samba-51b334e2d9739abc748490f6085ed8b8e5e1f4b4.tar.gz |
Fix bug #6431 - local groups from 3.0 setups no longer found.samba-3.4.0
Search for groups without group suffix, group suffix is only used for new entries.
(cherry picked from commit 91a8cb851e1919a337310e2c699d8fcf76a55060)
(cherry picked from commit f0d67b6e119d719c2540eadce5849d3200dea2d0)
-rw-r--r-- | source3/passdb/pdb_ldap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 5cbe675b94b..0886a10afe5 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)" |