svn commit: samba r21918 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch SAMBA_3_0_RELEASE/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-03-21 21:08:15 +0000 (Wed, 21 Mar 2007)
New Revision: 21918

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

Log:
Reverting this change as it is now causing aborts() in 
find_builtin_domain().    This all needs more testing
before anyone starts changing these lookup routines again.



Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
   branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-03-21 19:15:14 UTC (rev 21917)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c	2007-03-21 21:08:15 UTC (rev 21918)
@@ -604,13 +604,8 @@
 	/* Search through list */
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		/* 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)) {
+		if (sid_compare_domain(sid, &domain->sid) == 0)
 			return domain;
-		}
 	}
 
 	/* Not found */

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-03-21 19:15:14 UTC (rev 21917)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c	2007-03-21 21:08:15 UTC (rev 21918)
@@ -603,13 +603,8 @@
 	/* Search through list */
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		/* 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)) {
+		if (sid_compare_domain(sid, &domain->sid) == 0)
 			return domain;
-		}
 	}
 
 	/* Not found */

Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c	2007-03-21 19:15:14 UTC (rev 21917)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c	2007-03-21 21:08:15 UTC (rev 21918)
@@ -603,13 +603,8 @@
 	/* Search through list */
 
 	for (domain = domain_list(); domain != NULL; domain = domain->next) {
-		/* 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)) {
+		if (sid_compare_domain(sid, &domain->sid) == 0)
 			return domain;
-		}
 	}
 
 	/* Not found */