From cfe893375473f6d12fd806347827baa615f0cd0a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 14 Jun 2005 19:04:39 +0000
Subject: [PATCH] r7581: fix bad merge (This used to be commit
 55d08311032b75724b525d8e0df506de3e988b15)

---
 source3/rpc_server/srv_samr_nt.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 7c6e9f4d92c..e510f69cc8e 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -763,8 +763,6 @@ NTSTATUS _samr_enum_dom_aliases(pipes_struct *p, SAMR_Q_ENUM_DOM_ALIASES *q_u, S
 	make_group_sam_entry_list(p->mem_ctx, &r_u->sam, &r_u->uni_grp_name,
 				  num_aliases, aliases);
 
-	if (!NT_STATUS_IS_OK(status)) return status;
-
 	init_samr_r_enum_dom_aliases(r_u, q_u->start_idx + num_aliases,
 				     num_aliases);
 
-- 
2.11.4.GIT