Author: jerry Date: 2005-06-14 19:04:39 +0000 (Tue, 14 Jun 2005) New Revision: 7581
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7581 Log: fix bad merge Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c Changeset: Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-06-14 18:44:22 UTC (rev 7580) +++ branches/SAMBA_3_0/source/rpc_server/srv_samr_nt.c 2005-06-14 19:04:39 UTC (rev 7581) @@ -763,8 +763,6 @@ 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);