[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-879-g5b50e50

[Günther Deschner]

The branch, master has been updated
       via  5b50e506d010c0c3fc15c1ecaef7aa9e5383691c (commit)
      from  88af0ec6e464a0b42f2b04c3c870c3e73ee1c6fd (commit)

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


- Log -----------------------------------------------------------------
commit 5b50e506d010c0c3fc15c1ecaef7aa9e5383691c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 6 20:59:32 2009 +0200

    s3-wkssvcs: fix check for BUILTIN\Administrators membership in wkssvc_Netr{Join,Unjoin}Domain2.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index acc1fb3..ab09e86 100644
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -306,7 +306,7 @@ WERROR _wkssvc_NetrJoinDomain2(pipes_struct *p,
 
 	if (!user_has_privileges(token, &se_machine_account) &&
 	    !nt_token_check_domain_rid(token, DOMAIN_GROUP_RID_ADMINS) &&
-	    !nt_token_check_domain_rid(token, BUILTIN_ALIAS_RID_ADMINS)) {
+	    !nt_token_check_sid(&global_sid_Builtin_Administrators, token)) {
 		DEBUG(5,("_wkssvc_NetrJoinDomain2: account doesn't have "
 			"sufficient privileges\n"));
 		return WERR_ACCESS_DENIED;
@@ -377,7 +377,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(pipes_struct *p,
 
 	if (!user_has_privileges(token, &se_machine_account) &&
 	    !nt_token_check_domain_rid(token, DOMAIN_GROUP_RID_ADMINS) &&
-	    !nt_token_check_domain_rid(token, BUILTIN_ALIAS_RID_ADMINS)) {
+	    !nt_token_check_sid(&global_sid_Builtin_Administrators, token)) {
 		DEBUG(5,("_wkssvc_NetrUnjoinDomain2: account doesn't have "
 			"sufficient privileges\n"));
 		return WERR_ACCESS_DENIED;


-- 
Samba Shared Repository