summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-06-14 19:04:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:57:14 -0500
commitcfe893375473f6d12fd806347827baa615f0cd0a (patch)
tree681f6644bfb0060d4c4cc3ac1dc1e0f421f4b2c3
parent6109b8ad9dd586dad508658c65e33d012cad42b1 (diff)
downloadsamba-cfe893375473f6d12fd806347827baa615f0cd0a.tar.gz
samba-cfe893375473f6d12fd806347827baa615f0cd0a.tar.bz2
samba-cfe893375473f6d12fd806347827baa615f0cd0a.zip
r7581: fix bad merge
(This used to be commit 55d08311032b75724b525d8e0df506de3e988b15)
-rw-r--r--source3/rpc_server/srv_samr_nt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 7c6e9f4d92..e510f69cc8 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);