The branch, master has been updated via 043c521 build: link pys3param against pytalloc-util not pytalloc via 3df9e62 s3-passdb Use supplied pdb_methods in default passdb search handlers from 2e5fc83 s3-prefork: Do not use mmap/mremap/munmap directly
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 043c5219328cfdac0c227fb7ee70dc185277f186 Author: Andrew Bartlett <abart...@samba.org> Date: Mon Aug 15 16:20:35 2011 +1000 build: link pys3param against pytalloc-util not pytalloc pytalloc is the python module, pytalloc-util is the library that we can depend on Andrew Bartlett Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Mon Aug 15 09:54:02 CEST 2011 on sn-devel-104 commit 3df9e62c97f3d90cd3f3ab72738bb6f6f7521590 Author: Andrew Bartlett <abart...@samba.org> Date: Mon Aug 15 11:47:36 2011 +1000 s3-passdb Use supplied pdb_methods in default passdb search handlers ----------------------------------------------------------------------- Summary of changes: source3/passdb/pdb_interface.c | 12 +++++++----- source3/wscript_build | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 44e7421..738b12f 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -1900,7 +1900,8 @@ static void search_end_groups(struct pdb_search *search) SAFE_FREE(state->groups); } -static bool pdb_search_grouptype(struct pdb_search *search, +static bool pdb_search_grouptype(struct pdb_methods *methods, + struct pdb_search *search, const struct dom_sid *sid, enum lsa_SidType type) { struct group_search *state; @@ -1911,8 +1912,9 @@ static bool pdb_search_grouptype(struct pdb_search *search, return False; } - if (!pdb_enum_group_mapping(sid, type, &state->groups, &state->num_groups, - True)) { + if (!NT_STATUS_IS_OK(methods->enum_group_mapping(methods, sid, type, + &state->groups, &state->num_groups, + True))) { DEBUG(0, ("Could not enum groups\n")); return False; } @@ -1927,7 +1929,7 @@ static bool pdb_search_grouptype(struct pdb_search *search, static bool pdb_default_search_groups(struct pdb_methods *methods, struct pdb_search *search) { - return pdb_search_grouptype(search, get_global_sam_sid(), SID_NAME_DOM_GRP); + return pdb_search_grouptype(methods, search, get_global_sam_sid(), SID_NAME_DOM_GRP); } static bool pdb_default_search_aliases(struct pdb_methods *methods, @@ -1935,7 +1937,7 @@ static bool pdb_default_search_aliases(struct pdb_methods *methods, const struct dom_sid *sid) { - return pdb_search_grouptype(search, sid, SID_NAME_ALIAS); + return pdb_search_grouptype(methods, search, sid, SID_NAME_ALIAS); } static struct samr_displayentry *pdb_search_getentry(struct pdb_search *search, diff --git a/source3/wscript_build b/source3/wscript_build index b5d3f1e..3cc8471 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -757,7 +757,7 @@ if bld.env.toplevel_build: bld.SAMBA3_PYTHON('pys3param', source='param/pyparam.c', deps='param', - public_deps='samba-hostconfig pytalloc talloc', + public_deps='samba-hostconfig pytalloc-util talloc', realname='samba/samba3/param.so') bld.SAMBA3_SUBSYSTEM('param_service', -- Samba Shared Repository