- oops, i got "add alias member" and "delete alias member" swapped.

- samr_enum_dom_users, the first 4 bytes is some sort of garbage,
  nt5-beta2 clears them out to zeros whereas nt4 does not.
  fixed bug where we were assuming that the first 4 bytes of a
  response _had_ to be non-zero.

- cli_lsarpc.c: forgot to append the rid on the lsa_lookup_names()
  client call.

- added in "addaliasmem" and "addgroupmem" commands.  the addaliasmem
  command actually turned out to be a "delaliasmem" :-) :-)

- parse_lsa.c: moved assert array check to after the size of useable
  array space is set...
(This used to be commit 165b15a8cacc4bc7cf8cc0b9aaabb6b92cef7fdb)

2 files changed, 3 insertions, 1 deletions

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index f80d6613f6..0516cee96d 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -192,10 +192,12 @@ BOOL lsa_lookup_names(struct cli_state *cli,
 			for (i = 0; i < (*num_sids); i++)
 			{
 				uint32 dom_idx = t_rids[i].rid_idx;
+				uint32 dom_rid = t_rids[i].rid;
 				DOM_SID *sid = &(*sids)[i];
 				if (dom_idx != 0xffffffff)
 				{
 					sid_copy(sid, &ref.ref_dom[dom_idx].ref_dom.sid);
+					sid_append_rid(sid, dom_rid);
 				}
 				else
 				{
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 2ea7d54821..9d3cbd22c2 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -861,7 +861,7 @@ BOOL samr_open_alias(struct cli_state *cli,
 	prs_init(&rdata, 0   , 4, SAFETY_MARGIN, True );
 
 	/* store the parameters */
-	make_samr_q_open_alias(&q_o, domain_pol, 0x0008, rid);
+	make_samr_q_open_alias(&q_o, domain_pol, 0x000f001f, rid);
 
 	/* turn parameters into data stream */
 	samr_io_q_open_alias("", &q_o,  &data, 0);