[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  207a84d s3-winbind: Fix paranoia checks in winbindd_samr.c.
      from  8c14dec build: fixed development symlinks for libraries in subdirectories

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


- Log -----------------------------------------------------------------
commit 207a84d725b905c2b119d2ef0f4f4d4eb391140d
Author: Andreas Schneider <asn at samba.org>
Date:   Fri May 20 15:42:46 2011 +0200

    s3-winbind: Fix paranoia checks in winbindd_samr.c.
    
    This fixes looking up the correct unix user instead of allocation a new
    uid and creating it.
    
    Fix bug #8215 (winbind unix username lookup doesn't work correctly).
    (cherry picked from commit 531edfdd1924bfb2ef486820f7f5787098bd953a)
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Wed Jun 15 09:56:01 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/winbindd/winbindd_samr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 3b9377f..48ce92d 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -762,8 +762,8 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
 	ZERO_STRUCT(lsa_policy);
 
 	/* Paranoia check */
-	if (!sid_check_is_builtin(domain_sid) &&
-	    !sid_check_is_domain(domain_sid) &&
+	if (!sid_check_is_in_builtin(domain_sid) &&
+	    !sid_check_is_in_our_domain(domain_sid) &&
 	    !sid_check_is_unix_users(domain_sid) &&
 	    !sid_check_is_unix_groups(domain_sid) &&
 	    !sid_check_is_in_wellknown_domain(domain_sid)) {


-- 
Samba Shared Repository