The branch, v3-3-test has been updated
via f2535d7b94cfc6bec05127576186d93531304005 (commit)
via 605f5911febc25f40c697d4fc1097584ba49021e (commit)
via 860da910633415d1a3c850ed977a6635d28a7bf2 (commit)
from cfc140d3924dd6be893d242ce5df22e2128f09f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit f2535d7b94cfc6bec05127576186d93531304005
Author: Volker Lendecke <[email protected]>
Date: Fri Jan 2 14:53:26 2009 +0100
Alternative fix for 45db33e73 and 0d443ae7931
Simo is right, we need to ask passdb first. At least this fixes a nasty to
find
NT_STATUS_ACCESS_DENIED problem in the build farm for the test run I just
did
on host "opi".
Michael, can you re-check if this also fixes the error you found, leading to
the two fixes?
Thanks,
Volker
commit 605f5911febc25f40c697d4fc1097584ba49021e
Author: Volker Lendecke <[email protected]>
Date: Fri Jan 2 15:02:03 2009 +0100
Revert "Fix uid_to_sid mapping when the idmap cache is empty."
This reverts commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f.
commit 860da910633415d1a3c850ed977a6635d28a7bf2
Author: Volker Lendecke <[email protected]>
Date: Fri Jan 2 15:01:47 2009 +0100
Revert "idmap: Remove passd check from idmap_backends_unixid_to_sid()."
This reverts commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b.
-----------------------------------------------------------------------
Summary of changes:
source/winbindd/idmap.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 6be55ef..ca07f23 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -735,6 +735,17 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
struct id_map *id)
maps[0] = id;
maps[1] = NULL;
+ /*
+ * Always give passdb a chance first
+ */
+
+ dom = idmap_init_passdb_domain(NULL);
+ if ((dom != NULL)
+ && NT_STATUS_IS_OK(dom->methods->unixids_to_sids(dom, maps))
+ && id->status == ID_MAPPED) {
+ return NT_STATUS_OK;
+ }
+
dom = idmap_find_domain(domname);
if (dom == NULL) {
return NT_STATUS_NONE_MAPPED;
--
Samba Shared Repository
