--- samba-3.0.23/source/nsswitch/winbindd_ads.c.filter_users	2006-04-20 03:29:21.000000000 +0100
+++ samba-3.0.23/source/nsswitch/winbindd_ads.c	2006-05-04 15:10:44.000000000 +0100
@@ -156,6 +156,7 @@
 			       ADS_ATTR_SFU_SHELL_OID,
 			       ADS_ATTR_SFU_GECOS_OID,
 			       NULL};
+	char *query = NULL;
 	int i, count;
 	ADS_STATUS rc;
 	void *res = NULL;
@@ -173,7 +174,14 @@
 		goto done;
 	}
 
-	rc = ads_search_retry(ads, &res, "(objectClass=user)", attrs);
+	if (use_nss_info("sfu"))
+		asprintf(&query,"(&(objectClass=user)(%s=*))",ads->schema.sfu_uidnumber_attr);
+
+	rc = ads_search_retry(ads, &res, query ? query : "(objectClass=user)", attrs);
+
+	if (query)
+		free(query);
+
 	if (!ADS_ERR_OK(rc) || !res) {
 		DEBUG(1,("query_user_list ads_search: %s\n", ads_errstr(rc)));
 		goto done;