svn commit: samba r22611 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/smbd SAMBA_3_0_25/source/lib SAMBA_3_0_25/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-04-30 16:32:17 +0000 (Mon, 30 Apr 2007)
New Revision: 22611

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

Log:
Fix from Jens Nissen <jens.nissen at gmx.net>. Fix bad
memory leak I introduced into acl code, also remove
redundent extra check for global_sid_System :

global_sid_System == S-1-5-18 which is already
included in the check for a domain of 
global_sid_NT_Authority == S-1-5

Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/util_sid.c
   branches/SAMBA_3_0/source/smbd/posix_acls.c
   branches/SAMBA_3_0_25/source/lib/util_sid.c
   branches/SAMBA_3_0_25/source/smbd/posix_acls.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_sid.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_sid.c	2007-04-30 14:32:50 UTC (rev 22610)
+++ branches/SAMBA_3_0/source/lib/util_sid.c	2007-04-30 16:32:17 UTC (rev 22611)
@@ -510,9 +510,6 @@
 	DOM_SID dom;
 	uint32 rid;
 
-	if (sid_equal(sid, &global_sid_System))
-		return True;
-
 	sid_copy(&dom, sid);
 	sid_split_rid(&dom, &rid);
 

Modified: branches/SAMBA_3_0/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/posix_acls.c	2007-04-30 14:32:50 UTC (rev 22610)
+++ branches/SAMBA_3_0/source/smbd/posix_acls.c	2007-04-30 16:32:17 UTC (rev 22611)
@@ -1413,6 +1413,7 @@
 			if (non_mappable_sid(&psa->trustee)) {
 				DEBUG(10,("create_canon_ace_lists: ignoring non-mappable SID %s\n",
 					sid_to_string(str, &psa->trustee) ));
+				SAFE_FREE(current_ace);
 				continue;
 			}
 

Modified: branches/SAMBA_3_0_25/source/lib/util_sid.c
===================================================================
--- branches/SAMBA_3_0_25/source/lib/util_sid.c	2007-04-30 14:32:50 UTC (rev 22610)
+++ branches/SAMBA_3_0_25/source/lib/util_sid.c	2007-04-30 16:32:17 UTC (rev 22611)
@@ -510,9 +510,6 @@
 	DOM_SID dom;
 	uint32 rid;
 
-	if (sid_equal(sid, &global_sid_System))
-		return True;
-
 	sid_copy(&dom, sid);
 	sid_split_rid(&dom, &rid);
 

Modified: branches/SAMBA_3_0_25/source/smbd/posix_acls.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/posix_acls.c	2007-04-30 14:32:50 UTC (rev 22610)
+++ branches/SAMBA_3_0_25/source/smbd/posix_acls.c	2007-04-30 16:32:17 UTC (rev 22611)
@@ -1413,6 +1413,7 @@
 			if (non_mappable_sid(&psa->trustee)) {
 				DEBUG(10,("create_canon_ace_lists: ignoring non-mappable SID %s\n",
 					sid_to_string(str, &psa->trustee) ));
+				SAFE_FREE(current_ace);
 				continue;
 			}