svn commit: samba r21914 - in branches/SAMBA_3_0_25/source/nsswitch: .

[jerry at samba.org]

Author: jerry
Date: 2007-03-21 17:54:49 +0000 (Wed, 21 Mar 2007)
New Revision: 21914

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

Log:
grab the sid_peek_check_rid() change for find_domain_from_sid_noinit() in SAMBA_3_0
Modified:
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-03-21 17:43:49 UTC (rev 21913)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-03-21 17:54:49 UTC (rev 21914)
@@ -603,8 +603,13 @@
 	/* Search through list */
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		if (sid_compare_domain(sid, &domain->sid) == 0)
+		/* We need to use sid_peek_check_rid, because we want 
+		 * to make sure that the SIDs we send to the backends are
+		 * as specific as possible.
+		 */
+		if (sid_peek_check_rid(&domain->sid, sid, &discard)) {
 			return domain;
+		}
 	}
 
 	/* Not found */