[SCM] Samba Shared Repository - branch master updated - 76d53e7648869bbdc83be1e07941467019b96321

[Volker Lendecke]

The branch, master has been updated
       via  76d53e7648869bbdc83be1e07941467019b96321 (commit)
       via  13248e8917015435c8979535531484344e3f2262 (commit)
       via  c033ea562669a2d28da53b3dbe566cdb7d26d43e (commit)
      from  71c74725bce403e36e4dc38287802c95b8d4de66 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 76d53e7648869bbdc83be1e07941467019b96321
Author: Volker Lendecke <vl at samba.org>
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 13248e8917015435c8979535531484344e3f2262
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 2 14:51:23 2009 +0100

    Revert "s:Fix uid_to_sid mapping when the idmap cache is empty."
    
    This reverts commit 9a9b64dbdfce4414ada22d4f882c8c757b5813e1.

commit c033ea562669a2d28da53b3dbe566cdb7d26d43e
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 2 14:51:06 2009 +0100

    Revert "s3:idmap: Remove passd check from idmap_backends_unixid_to_sid()."
    
    This reverts commit 45db33e73262d8e195a46fb96405dfb3dc43d6bc.

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/idmap.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 6be55ef..ca07f23 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/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