Index: smbd/uid.c
===================================================================
RCS file: /cvsroot/samba/source/smbd/uid.c,v
retrieving revision 1.85.2.19
diff -u -r1.85.2.19 uid.c
--- smbd/uid.c	6 Aug 2003 01:14:51 -0000	1.85.2.19
+++ smbd/uid.c	10 Aug 2003 09:19:38 -0000
@@ -794,27 +794,27 @@
 
 	if (fetch_uid_from_cache(puid, psid))
 		return NT_STATUS_OK;
-
-	/* if this is our SID then go straight to a local lookup */
-	
-	if ( sid_compare_domain(get_global_sam_sid(), psid) == 0 ) {
-		DEBUG(10,("sid_to_uid: my domain (%s) - trying local.\n",
-			sid_string_static(psid) ));
-		
-		if ( local_sid_to_uid(puid, psid, &name_type) )
-			goto success;
-			
-		DEBUG(10,("sid_to_uid: local lookup failed\n"));
-		
-		return NT_STATUS_UNSUCCESSFUL;
-	}
 	
 	/* If it is not our local domain, only hope is winbindd */
 
 	if ( !winbind_lookup_sid(psid, dom_name, name, &name_type) ) {
-		DEBUG(10,("sid_to_uid: winbind lookup for non-local sid %s failed\n",
+		DEBUG(10,("sid_to_uid: winbind lookup for sid %s failed\n",
 			sid_string_static(psid) ));
+
+		/* if this is our SID then go straight to a local lookup */
+	
+		if ( sid_compare_domain(get_global_sam_sid(), psid) == 0 ) {
+			DEBUG(10,("sid_to_uid: my domain (%s) - trying local.\n",
+				sid_string_static(psid) ));
+		
+			if ( local_sid_to_uid(puid, psid, &name_type) )
+				goto success;
 			
+			DEBUG(10,("sid_to_uid: local lookup failed\n"));
+			
+			return NT_STATUS_UNSUCCESSFUL;
+		}
+
 		return NT_STATUS_UNSUCCESSFUL;
 	}