svn commit: samba r17973 - in branches/SAMBA_3_0_RELEASE: . source/passdb

[jerry at samba.org]

Author: jerry
Date: 2006-08-31 18:50:55 +0000 (Thu, 31 Aug 2006)
New Revision: 17973

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

Log:
emrge the SID cache fixes for 3.0.23c
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/passdb/lookup_sid.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-08-31 18:33:50 UTC (rev 17972)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2006-08-31 18:50:55 UTC (rev 17973)
@@ -99,6 +99,8 @@
     * More changes to ensure that the primary group SID for 
       a local user is based on the primary Unix group and not the
       primaryGroupSID passdb attribute.
+    * Disable storing SIDs in the S-1-22-1 and S-1-22-2 domain 
+      to the SID<->uid/gid cache.
 
 
 o   Guenther Deschner <gd at samba.org>

Modified: branches/SAMBA_3_0_RELEASE/source/passdb/lookup_sid.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/lookup_sid.c	2006-08-31 18:33:50 UTC (rev 17972)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/lookup_sid.c	2006-08-31 18:50:55 UTC (rev 17973)
@@ -951,6 +951,11 @@
 {
 	struct uid_sid_cache *pc;
 
+	/* do not store SIDs in the "Unix Group" domain */
+	
+	if ( sid_check_is_in_unix_users( psid ) )
+		return;
+
 	if (n_uid_sid_cache >= MAX_UID_SID_CACHE_SIZE && n_uid_sid_cache > TURNOVER_UID_SID_CACHE_SIZE) {
 		/* Delete the last TURNOVER_UID_SID_CACHE_SIZE entries. */
 		struct uid_sid_cache *pc_next;
@@ -1022,6 +1027,11 @@
 void store_gid_sid_cache(const DOM_SID *psid, gid_t gid)
 {
 	struct gid_sid_cache *pc;
+	
+	/* do not store SIDs in the "Unix Group" domain */
+	
+	if ( sid_check_is_in_unix_groups( psid ) )
+		return;
 
 	if (n_gid_sid_cache >= MAX_GID_SID_CACHE_SIZE && n_gid_sid_cache > TURNOVER_GID_SID_CACHE_SIZE) {
 		/* Delete the last TURNOVER_GID_SID_CACHE_SIZE entries. */