From: Gerald Carter <jerry@samba.org>
Date: Wed, 21 Mar 2007 21:08:15 +0000 (+0000)
Subject: r21918: Reverting this change as it is now causing aborts() in
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~886
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=add225e1c8fef1d3ddb7fd43c1744858df45ecfd;p=thirdparty%2Fsamba.git

r21918: 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.
---

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index b649dc4768a..10fbd7c639b 100644
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -604,13 +604,8 @@ struct winbindd_domain *find_domain_from_sid_noinit(const DOM_SID *sid)
 	/* 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 */