--- samba-3.0.25a/source/rpc_server/srv_lsa_nt.c.dist	2007-05-11 07:09:35.000000000 +0900
+++ samba-3.0.25a/source/rpc_server/srv_lsa_nt.c	2007-06-09 01:11:34.374191983 +0900
@@ -949,6 +949,9 @@ NTSTATUS _lsa_lookup_sids(pipes_struct *
 						&ref,
 						&names,
 						&mapped_count);
+	if (!NT_STATUS_IS_OK(r_u->status)) {
+		return r_u->status;
+	}
 
 	/* Convert from LSA_TRANS_NAME_ENUM2 to LSA_TRANS_NAME_ENUM */
 
--- samba-3.0.25a/source/rpc_server/srv_lsa.c.dist	2006-04-20 11:29:27.000000000 +0900
+++ samba-3.0.25a/source/rpc_server/srv_lsa.c	2007-06-09 01:16:47.772051509 +0900
@@ -172,6 +172,10 @@ static BOOL api_lsa_lookup_sids(pipes_st
 	}
 
 	r_u.status = _lsa_lookup_sids(p, &q_u, &r_u);
+	if (!NT_STATUS_IS_OK(r_u.status)) {
+		DEBUG(0,("api_lsa_lookup_sids: Failed to lookup SIDs\n"));
+		return False;
+	}
 
 	if(!lsa_io_r_lookup_sids("", &r_u, rdata, 0)) {
 		DEBUG(0,("api_lsa_lookup_sids: Failed to marshall LSA_R_LOOKUP_SIDS.\n"));