diff -Nrbu samba-3.0.23a/source/passdb/lookup_sid.c samba-3.0.23a-OK/source/passdb/lookup_sid.c
--- samba-3.0.23a/source/passdb/lookup_sid.c	2006-07-10 20:27:52.000000000 +0400
+++ samba-3.0.23a-OK/source/passdb/lookup_sid.c	2006-09-22 15:36:49.000000000 +0400
@@ -1054,7 +1054,8 @@
 	if (fetch_sid_from_uid_cache(psid, uid))
 		return;
 
-	if (lp_idmap_uid(&low, &high) && (uid >= low) && (uid <= high) &&
+	if ((lp_winbind_trusted_domains_only() ||
+	     (lp_idmap_uid(&low, &high) && (uid >= low) && (uid <= high))) &&
 	    winbind_uid_to_sid(psid, uid)) {
 
 		DEBUG(10,("uid_to_sid: winbindd %u -> %s\n",
@@ -1099,7 +1100,8 @@
 	if (fetch_sid_from_gid_cache(psid, gid))
 		return;
 
-	if (lp_idmap_gid(&low, &high) && (gid >= low) && (gid <= high) &&
+	if ((lp_winbind_trusted_domains_only() ||
+	     (lp_idmap_gid(&low, &high) && (gid >= low) && (gid <= high))) &&
 	    winbind_gid_to_sid(psid, gid)) {
 
 		DEBUG(10,("gid_to_sid: winbindd %u -> %s\n",