Index: source/rpc_server/srv_lsa_nt.c
===================================================================
--- source/rpc_server/srv_lsa_nt.c	(revision 3760)
+++ source/rpc_server/srv_lsa_nt.c	(working copy)
@@ -281,8 +281,14 @@
 			}
 			dom_idx = init_dom_ref(ref, dom_name, &find_sid);
 
-			DEBUG(10,("init_lsa_trans_names: added user '%s\\%s' to "
-				  "referenced list.\n", dom_name, name ));
+			if (find_sid.num_auths == 4) {
+				DEBUG(10,("init_lsa_trans_names: added domain '%s' to "
+					  "referenced list.\n", name ));
+				
+			} else {
+				DEBUG(10,("init_lsa_trans_names: added user '%s\\%s' to "
+					  "referenced list.\n", dom_name, name ));
+			}
 
 		}
 
Index: source/passdb/lookup_sid.c
===================================================================
--- source/passdb/lookup_sid.c	(revision 3760)
+++ source/passdb/lookup_sid.c	(working copy)
@@ -76,6 +76,13 @@
 	/* Check if this is our own sid.  This should perhaps be done by
 	   winbind?  For the moment handle it here. */
 
+	if (sid->num_auths == 4 && sid_equal(get_global_sam_sid(), sid)) {
+		DOM_SID tmp_sid;
+		sid_copy(&tmp_sid, sid);
+		return map_domain_sid_to_name(&tmp_sid, dom_name) && 
+			local_lookup_sid(sid, name, name_type);
+	}
+
 	if (sid->num_auths == 5) {
 		DOM_SID tmp_sid;
 		uint32 rid;
Index: source/passdb/passdb.c
===================================================================
--- source/passdb/passdb.c	(revision 3760)
+++ source/passdb/passdb.c	(working copy)
@@ -742,6 +742,13 @@
 	GROUP_MAP map;
 	BOOL ret;
 
+	if (sid_equal(get_global_sam_sid(), sid)) {
+		*psid_name_use = SID_NAME_DOMAIN;
+		fstrcpy(name, get_global_sam_name());
+		DEBUG(5,("local_lookup_sid: SID is our own domain-sid: %s.\n", sid_string_static(sid)));
+		return True;
+	}
+
 	if (!sid_peek_check_rid(get_global_sam_sid(), sid, &rid)){
 		DEBUG(0,("local_lookup_sid: sid_peek_check_rid return False! SID: %s\n",
 			sid_string_static(&map.sid)));