svn commit: samba r23929 - in branches: SAMBA_3_2/source/libgpo SAMBA_3_2_0/source/libgpo

[gd at samba.org]

Author: gd
Date: 2007-07-17 11:52:23 +0000 (Tue, 17 Jul 2007)
New Revision: 23929

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23929

Log:
Deleting gpo_sd_check_trustee_in_sid_token() as nt_token_check_sid() is what we
need here.

Guenther

Modified:
   branches/SAMBA_3_2/source/libgpo/gpo_sec.c
   branches/SAMBA_3_2_0/source/libgpo/gpo_sec.c


Changeset:
Modified: branches/SAMBA_3_2/source/libgpo/gpo_sec.c
===================================================================
--- branches/SAMBA_3_2/source/libgpo/gpo_sec.c	2007-07-17 11:47:17 UTC (rev 23928)
+++ branches/SAMBA_3_2/source/libgpo/gpo_sec.c	2007-07-17 11:52:23 UTC (rev 23929)
@@ -92,29 +92,12 @@
 /****************************************************************
 ****************************************************************/
 
-static BOOL gpo_sd_check_trustee_in_sid_token(const DOM_SID *trustee,
-					      const struct nt_user_token *token)
-{
-	int i;
-
-	for (i = 0; i < token->num_sids; i++) {
-		if (sid_equal(trustee, &token->user_sids[i])) {
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************
-****************************************************************/
-
 static NTSTATUS gpo_sd_check_ace_denied_object(const SEC_ACE *ace, 
 					       const struct nt_user_token *token) 
 {
 	if (gpo_sd_check_agp_object(ace) &&
 	    gpo_sd_check_agp_access_bits(ace->access_mask) &&
-	    gpo_sd_check_trustee_in_sid_token(&ace->trustee, token)) {
+	    nt_token_check_sid(&ace->trustee, token)) {
 		DEBUG(10,("gpo_sd_check_ace_denied_object: Access denied as of ace for %s\n", 
 			sid_string_static(&ace->trustee)));
 		return NT_STATUS_ACCESS_DENIED;
@@ -131,7 +114,7 @@
 {
 	if (gpo_sd_check_agp_object(ace) &&
 	    gpo_sd_check_agp_access_bits(ace->access_mask) && 
-	    gpo_sd_check_trustee_in_sid_token(&ace->trustee, token)) {
+	    nt_token_check_sid(&ace->trustee, token)) {
 		DEBUG(10,("gpo_sd_check_ace_allowed_object: Access granted as of ace for %s\n", 
 			sid_string_static(&ace->trustee)));
 		return NT_STATUS_OK;

Modified: branches/SAMBA_3_2_0/source/libgpo/gpo_sec.c
===================================================================
--- branches/SAMBA_3_2_0/source/libgpo/gpo_sec.c	2007-07-17 11:47:17 UTC (rev 23928)
+++ branches/SAMBA_3_2_0/source/libgpo/gpo_sec.c	2007-07-17 11:52:23 UTC (rev 23929)
@@ -92,29 +92,12 @@
 /****************************************************************
 ****************************************************************/
 
-static BOOL gpo_sd_check_trustee_in_sid_token(const DOM_SID *trustee,
-					      const struct nt_user_token *token)
-{
-	int i;
-
-	for (i = 0; i < token->num_sids; i++) {
-		if (sid_equal(trustee, &token->user_sids[i])) {
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************
-****************************************************************/
-
 static NTSTATUS gpo_sd_check_ace_denied_object(const SEC_ACE *ace, 
 					       const struct nt_user_token *token) 
 {
 	if (gpo_sd_check_agp_object(ace) &&
 	    gpo_sd_check_agp_access_bits(ace->access_mask) &&
-	    gpo_sd_check_trustee_in_sid_token(&ace->trustee, token)) {
+	    nt_token_check_sid(&ace->trustee, token)) {
 		DEBUG(10,("gpo_sd_check_ace_denied_object: Access denied as of ace for %s\n", 
 			sid_string_static(&ace->trustee)));
 		return NT_STATUS_ACCESS_DENIED;
@@ -131,7 +114,7 @@
 {
 	if (gpo_sd_check_agp_object(ace) &&
 	    gpo_sd_check_agp_access_bits(ace->access_mask) && 
-	    gpo_sd_check_trustee_in_sid_token(&ace->trustee, token)) {
+	    nt_token_check_sid(&ace->trustee, token)) {
 		DEBUG(10,("gpo_sd_check_ace_allowed_object: Access granted as of ace for %s\n", 
 			sid_string_static(&ace->trustee)));
 		return NT_STATUS_OK;