[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3490-g6718126

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  671812696217fe1337562b661d5131be79797f1c (commit)
      from  5fb3b5e903c08013074ba473399ddee30f6c328f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 671812696217fe1337562b661d5131be79797f1c
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Fri Feb 27 08:35:18 2009 -0800

    s3: fix guest auth when winbindd is running
    
    This fix is very subtle.  If a server is configured with "security = share"
    and "guest ok = yes" and winbindd is running authorization will fail during
    tree connect.
    
    This is due to our inability to map the guest sid S-1-5-21-X-501 to a uid
    through sid_to_uid().  Winbindd is unaware of the hard coded mapping
    between this sid and whatever uid the name in lp_guestaccount() is assigned.
    So sid_to_uid() fails and we exit create_token_from_username() without
    ever calling pdb_getsampwsid() which IS aware of the hard coded mapping.
    
    This patch just reorganizes the code, moving sid_to_uid() down to the
    block of code in which it is needed, avoiding this early failure.

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

Summary of changes:
 source/auth/auth_util.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 939fbee..f3075ac 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -773,7 +773,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
 }
 
 /*
- * Create an artificial NT token given just a username. (Initially indended
+ * Create an artificial NT token given just a username. (Initially intended
  * for force user)
  *
  * We go through lookup_name() to avoid problems we had with 'winbind use
@@ -826,12 +826,6 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 		goto done;
 	}
 
-	if (!sid_to_uid(&user_sid, uid)) {
-		DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
-			  username, sid_string_dbg(&user_sid)));
-		goto done;
-	}
-
 	if (sid_check_is_in_our_domain(&user_sid)) {
 		bool ret;
 
@@ -889,6 +883,12 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
 	unix_user:
 
+		if (!sid_to_uid(&user_sid, uid)) {
+			DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
+				  username, sid_string_dbg(&user_sid)));
+			goto done;
+		}
+
 		uid_to_unix_users_sid(*uid, &user_sid);
 
 		pass = getpwuid_alloc(tmp_ctx, *uid);


-- 
Samba Shared Repository