doing a code reshuffle. want to add code to establish trust relationships.

(This used to be commit 3ec269b402ba6898d905ea1029c427e1b645faf4)

1 files changed, 0 insertions, 934 deletions

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index a97288d0a2..543e232065 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -114,940 +114,6 @@ static void sam_display_user(const char *domain, const DOM_SID *sid,
 			user_rid, user_name);
 }
 
-static BOOL req_user_info(struct cli_state *cli, uint16 fnum,
-				POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 user_rid,
-				USER_INFO_FN(usr_inf))
-{
-	SAM_USER_INFO_21 usr;
-	/* send user info query, level 0x15 */
-	if (get_samr_query_userinfo(smb_cli, fnum,
-				    pol_dom,
-				    0x15, user_rid, &usr))
-	{
-		if (usr_inf != NULL)
-		{
-			usr_inf(domain, sid, user_rid, &usr);
-		}
-		return True;
-	}
-	return False;
-}
-
-/****************************************************************************
-SAM Query User Groups.
-****************************************************************************/
-uint32 sam_query_usergroups(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 user_rid,
-				const char *user_name,
-				uint32 *num_groups,
-				DOM_GID **gid,
-				char    ***name,
-				uint32  **type,
-				USER_MEM_FN(usr_mem))
-{
-	uint32 num_names = 0;
-	(*gid) = NULL;
-	/* send user group query */
-	if (get_samr_query_usergroups(smb_cli, fnum,
-				      pol_dom,
-				      user_rid, num_groups, gid) &&
-	    gid != NULL)
-	{
-		uint32 i;
-		uint32 *rid_mem;
-
-		rid_mem = (uint32*)malloc((*num_groups) * sizeof(rid_mem[0]));
-
-		if (rid_mem == NULL)
-		{
-			free(*gid);
-			(*gid) = NULL;
-			return 0;
-		}
-
-		for (i = 0; i < (*num_groups); i++)
-		{
-			rid_mem[i] = (*gid)[i].g_rid;
-		}
-
-		if (samr_query_lookup_rids(smb_cli, fnum, 
-				pol_dom, 0x3e8,
-				(*num_groups), rid_mem, 
-				&num_names, name, type))
-		{
-			usr_mem(domain, sid,
-			       user_rid, user_name,
-			       num_names, rid_mem, *name, *type);
-		}
-	}
-
-	return num_names;
-}
-
-static uint32 req_group_info(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain, const DOM_SID *sid,
-				uint32 user_rid, const char *user_name,
-				USER_MEM_FN(usr_mem))
-{
-	uint32 num_groups;
-	uint32 num_names;
-	DOM_GID *gid = NULL;
-	char    **name   = NULL;
-	uint32  *type    = NULL;
-
-	num_names = sam_query_usergroups(cli, fnum, pol_dom,
-				domain, sid,
-				user_rid, user_name,
-				&num_groups, &gid,
-				&name, &type, usr_mem);
-
-	free_char_array(num_names, name);
-	if (type != NULL)
-	{
-		free(type);
-	}
-
-	if (gid != NULL)
-	{
-		free(gid);
-	}
-
-	return num_names;
-}
-
-static void req_alias_info(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid1, uint32 user_rid,
-				const char *user_name,
-				USER_MEM_FN(usr_mem))
-{
-	uint32 num_aliases;
-	uint32 *rid_mem = NULL;
-	uint32 *ptr_sid;
-	DOM_SID2 *als_sid;
-
-	ptr_sid = (uint32*)  malloc(sizeof(ptr_sid[0]) * 1);
-	als_sid = (DOM_SID2*)malloc(sizeof(als_sid[0]) * 1);
-
-        sid_copy(&als_sid[0].sid, sid1);
-	sid_append_rid(&als_sid[0].sid, user_rid);
-	als_sid[0].num_auths = als_sid[0].sid.num_auths;
-
-	ptr_sid[0] = 1;
-
-	/* send user alias query */
-	if (samr_query_useraliases(cli, fnum,
-				pol_dom,
-				ptr_sid, als_sid, &num_aliases, &rid_mem))
-	{
-		uint32 num_names;
-		char    **name = NULL;
-		uint32  *type = NULL;
-
-		uint32 *rid_copy = (uint32*)malloc(num_aliases * sizeof(*rid_copy));
-
-		if (rid_copy != NULL)
-		{
-			uint32 i;
-			for (i = 0; i < num_aliases; i++)
-			{
-				rid_copy[i] = rid_mem[i];
-			}
-			if (samr_query_lookup_rids(cli, fnum, 
-					pol_dom, 0x3e8,
-					num_aliases, rid_copy, 
-					&num_names, &name, &type))
-			{
-				usr_mem(domain, sid1,
-				       user_rid, user_name,
-				       num_names, rid_mem, name, type);
-			}
-		}
-
-		free_char_array(num_names, name);
-		if (type != NULL)
-		{
-			free(type);
-		}
-	}
-
-	if (rid_mem != NULL)
-	{
-		free(rid_mem);
-		rid_mem = NULL;
-	}
-
-	if (ptr_sid != NULL)
-	{
-		free(ptr_sid);
-		ptr_sid = NULL;
-	}
-	if (als_sid != NULL)
-	{
-		free(als_sid);
-		als_sid = NULL;
-	}
-}
-
-/****************************************************************************
-experimental SAM users enum.
-****************************************************************************/
-int msrpc_sam_enum_users(struct cli_state *cli,
-			const char* domain,
-			const DOM_SID *sid1,
-			const char* srv_name,
-			struct acct_info **sam,
-			uint32 *num_sam_entries,
-			USER_FN(usr_fn),
-			USER_INFO_FN(usr_inf_fn),
-			USER_MEM_FN(usr_grp_fn),
-			USER_MEM_FN(usr_als_fn))
-{
-	uint16 fnum;
-	DOM_SID sid_1_5_20;
-	uint32 user_idx;
-	BOOL res = True;
-	BOOL res1 = True;
-	BOOL res2 = True;
-	uint32 start_idx = 0x0;
-	uint16 unk_0 = 0x0;
-	uint16 acb_mask = 0;
-	uint16 unk_1 = 0x0;
-	uint32 ace_perms = 0x304; /* access control permissions */
-	uint32 status;
-	POLICY_HND sam_pol;
-	POLICY_HND pol_dom;
-	POLICY_HND pol_blt;
-
-	(*sam) = NULL;
-	(*num_sam_entries) = 0;
-
-	string_to_sid(&sid_1_5_20, "S-1-5-32");
-
-	DEBUG(5,("Number of entries:%d unk_0:%04x acb_mask:%04x unk_1:%04x\n",
-	          start_idx, unk_0, acb_mask, unk_1));
-
-	/* open SAMR session.  negotiate credentials */
-	res = res ? cli_nt_session_open(cli, PIPE_SAMR, &fnum) : False;
-
-	/* establish a connection. */
-	res = res ? samr_connect(cli, fnum, 
-				srv_name, 0x02000000,
-				&sam_pol) : False;
-
-	/* connect to the domain */
-	res1 = res ? samr_open_domain(cli, fnum, 
-	            &sam_pol, ace_perms, sid1,
-	            &pol_dom) : False;
-
-	/* connect to the S-1-5-20 domain */
-	res2 = res ? samr_open_domain(cli, fnum, 
-	            &sam_pol, ace_perms, &sid_1_5_20,
-	            &pol_blt) : False;
-
-	if (res1)
-	{
-		/* read some users */
-		do
-		{
-			status = samr_enum_dom_users(cli, fnum, 
-			     &pol_dom,
-			     &start_idx, acb_mask, unk_1, 0x100000,
-			     sam, num_sam_entries);
-
-		} while (status == STATUS_MORE_ENTRIES);
-
-		if ((*num_sam_entries) == 0)
-		{
-			report(out_hnd, "No users\n");
-		}
-
-		/* query all the users */
-		for (user_idx = 0; res && user_idx <
-			      (*num_sam_entries); user_idx++)
-		{
-			uint32 user_rid  = (*sam)[user_idx].rid;
-			char  *user_name = (*sam)[user_idx].acct_name;
-
-			if (usr_fn != NULL)
-			{
-				usr_fn(domain, sid1, user_rid, user_name);
-			}
-
-			if (usr_inf_fn != NULL)
-			{
-				req_user_info(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  user_rid, 
-				                  usr_inf_fn);
-			}
-
-			if (usr_grp_fn != NULL)
-			{
-				req_group_info(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  user_rid, user_name,
-				                  usr_grp_fn);
-			}
-
-			if (usr_als_fn != NULL)
-			{
-				req_alias_info(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  user_rid, user_name,
-				                  usr_als_fn);
-				req_alias_info(cli, fnum, &pol_blt,
-				                  domain, sid1,
-				                  user_rid, user_name,
-				                  usr_als_fn);
-			}
-		}
-	}
-
-	res2 = res2 ? samr_close(cli, fnum, &pol_blt) : False;
-	res1 = res1 ? samr_close(cli, fnum, &pol_dom) : False;
-	res  = res  ? samr_close(cli, fnum, &sam_pol) : False;
-
-	/* close the session */
-	cli_nt_session_close(cli, fnum);
-
-	if (res)
-	{
-		DEBUG(5,("msrpc_sam_enum_users: succeeded\n"));
-	}
-	else
-	{
-		DEBUG(5,("msrpc_sam_enum_users: failed\n"));
-	}
-
-	return (*num_sam_entries);
-}
-
-
-/****************************************************************************
-experimental SAM domain info query.
-****************************************************************************/
-BOOL sam_query_dominfo(struct client_info *info, const DOM_SID *sid1,
-				uint32 switch_value, SAM_UNK_CTR *ctr)
-{
-	uint16 fnum;
-	fstring srv_name;
-	BOOL res = True;
-	BOOL res1 = True;
-	BOOL res2 = True;
-	uint32 ace_perms = 0x02000000; /* absolutely no idea. */
-	POLICY_HND sam_pol;
-	POLICY_HND pol_dom;
-
-	fstrcpy(srv_name, "\\\\");
-	fstrcat(srv_name, info->dest_host);
-	strupper(srv_name);
-
-	/* open SAMR session.  negotiate credentials */
-	res = res ? cli_nt_session_open(smb_cli, PIPE_SAMR, &fnum) : False;
-
-	/* establish a connection. */
-	res = res ? samr_connect(smb_cli, fnum, 
-				srv_name, 0x02000000,
-				&sam_pol) : False;
-
-	/* connect to the domain */
-	res1 = res ? samr_open_domain(smb_cli, fnum, 
-	            &sam_pol, ace_perms, sid1,
-	            &pol_dom) : False;
-
-	/* send a samr 0x8 command */
-	res2 = res ? samr_query_dom_info(smb_cli, fnum,
-	            &pol_dom, switch_value, ctr) : False;
-
-	res1 = res1 ? samr_close(smb_cli, fnum,
-	            &sam_pol) : False;
-
-	res = res ? samr_close(smb_cli, fnum, 
-	            &pol_dom) : False;
-
-	/* close the session */
-	cli_nt_session_close(smb_cli, fnum);
-
-	if (res2)
-	{
-		DEBUG(5,("sam_query_dominfo: succeeded\n"));
-	}
-	else
-	{
-		DEBUG(5,("sam_query_dominfo: failed\n"));
-	}
-
-	return res2;
-}
-
-
-static BOOL query_aliasinfo(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 alias_rid,
-				ALIAS_INFO_FN(grp_inf))
-{
-	ALIAS_INFO_CTR ctr;
-
-	/* send alias info query */
-	if (get_samr_query_aliasinfo(smb_cli, fnum,
-				      pol_dom,
-				      3, /* info level */
-	                              alias_rid, &ctr))
-	{
-		if (grp_inf != NULL)
-		{
-			grp_inf(domain, sid, alias_rid, &ctr);
-		}
-		return True;
-	}
-	return False;
-}
-
-BOOL sam_query_aliasmem(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				uint32 alias_rid,
-				uint32 *num_names,
-				DOM_SID ***sids,
-				char ***name,
-				uint8 **type)
-{
-	BOOL res3 = True;
-	BOOL res4 = True;
-	DOM_SID2 sid_mem[MAX_LOOKUP_SIDS];
-	uint32 num_aliases = 0;
-
-	*sids = NULL;
-	*num_names = 0;
-	*name = NULL;
-	*type = NULL;
-
-	/* get alias members */
-	res3 = get_samr_query_aliasmem(smb_cli, fnum, 
-			pol_dom,
-			alias_rid, &num_aliases, sid_mem);
-
-	if (res3 && num_aliases != 0)
-	{
-		fstring srv_name;
-		uint16 fnum_lsa;
-		POLICY_HND lsa_pol;
-
-		uint32 i;
-		uint32 numsids = 0;
-
-		fstrcpy(srv_name, "\\\\");
-		fstrcat(srv_name, cli->desthost);
-		strupper(srv_name);
-
-		for (i = 0; i < num_aliases; i++)
-		{
-			add_sid_to_array(&numsids, sids, &sid_mem[i].sid);
-		}
-
-		/* open LSARPC session. */
-		res3 = res3 ? cli_nt_session_open(smb_cli, PIPE_LSARPC, &fnum_lsa) : False;
-
-		/* lookup domain controller; receive a policy handle */
-		res3 = res3 ? lsa_open_policy(smb_cli, fnum_lsa,
-					srv_name,
-					&lsa_pol, True) : False;
-
-		/* send lsa lookup sids call */
-		res4 = res3 ? lsa_lookup_sids(smb_cli, fnum_lsa, 
-					       &lsa_pol,
-					       num_aliases, *sids, 
-					       name, type, num_names) : False;
-
-		res3 = res3 ? lsa_close(smb_cli, fnum_lsa, &lsa_pol) : False;
-
-		cli_nt_session_close(smb_cli, fnum_lsa);
-	}
-
-	if (!res4)
-	{
-		free_char_array(*num_names, *name);
-		if ((*type) != NULL)
-		{
-			free(*type);
-		}
-		if ((*sids) != NULL)
-		{
-			free_sid_array(num_aliases, *sids);
-		}
-		*num_names = 0;
-		*name = NULL;
-		*type = NULL;
-		*sids = NULL;
-	}
-
-	return res4;
-}
-
-static BOOL req_aliasmem_info(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 alias_rid,
-				const char *alias_name,
-				ALIAS_MEM_FN(als_mem))
-{
-	uint32 num_names = 0;
-	char **name = NULL;
-	uint8 *type = NULL;
-	DOM_SID **sids = NULL;
-
-	if (sam_query_aliasmem(cli, fnum, pol_dom, alias_rid,
-					&num_names, &sids,
-					&name, &type))
-	{
-		als_mem(domain, sid,
-		       alias_rid, alias_name,
-		       num_names, sids, name, type);
-
-		free_char_array(num_names, name);
-		if (type != NULL)
-		{
-			free(type);
-		}
-		if (sids != NULL)
-		{
-			free_sid_array(num_names, sids);
-		}
-		return True;
-	}
-	return False;
-}
-
-BOOL sam_query_groupmem(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				uint32 group_rid,
-				uint32 *num_names,
-				uint32 **rid_mem,
-				char ***name,
-				uint32 **type)
-{
-	uint32 num_mem;
-	uint32 *attr_mem = NULL;
-	BOOL res3;
-
-	*rid_mem = NULL;
-	*num_names = 0;
-	*name = NULL;
-	*type = NULL;
-
-	/* get group members */
-	res3 = get_samr_query_groupmem(cli, fnum, 
-		pol_dom,
-		group_rid, &num_mem, rid_mem, &attr_mem);
-
-	if (res3 && num_mem != 0)
-	{
-		uint32 *rid_copy = (uint32*)malloc(num_mem *
-		                                   sizeof(rid_copy[0]));
-
-		if (rid_copy != NULL)
-		{
-			uint32 i;
-			for (i = 0; i < num_mem; i++)
-			{
-				rid_copy[i] = (*rid_mem)[i];
-			}
-			/* resolve names */
-			res3 = samr_query_lookup_rids(cli, fnum,
-		                   pol_dom, 1000,
-		                   num_mem, rid_copy, num_names, name, type);
-		}
-	}
-	else
-	{
-		if (attr_mem != NULL)
-		{
-			free(attr_mem);
-		}
-		if ((*rid_mem) != NULL)
-		{
-			free(*rid_mem);
-		}
-		attr_mem = NULL;
-		*rid_mem = NULL;
-	}
-
-	if (!res3)
-	{
-		free_char_array(*num_names, *name);
-		if ((*type) != NULL)
-		{
-			free(*type);
-		}
-		*num_names = 0;
-		*name = NULL;
-		*type = NULL;
-	}
-
-	if (attr_mem != NULL)
-	{
-		free(attr_mem);
-	}
-
-	return res3;
-}
-
-static BOOL query_groupinfo(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 group_rid,
-				GROUP_INFO_FN(grp_inf))
-{
-	GROUP_INFO_CTR ctr;
-
-	/* send group info query */
-	if (get_samr_query_groupinfo(smb_cli, fnum,
-				      pol_dom,
-				      1, /* info level */
-	                              group_rid, &ctr))
-	{
-		if (grp_inf != NULL)
-		{
-			grp_inf(domain, sid, group_rid, &ctr);
-		}
-		return True;
-	}
-	return False;
-}
-
-static BOOL req_groupmem_info(struct cli_state *cli, uint16 fnum,
-				const POLICY_HND *pol_dom,
-				const char *domain,
-				const DOM_SID *sid,
-				uint32 group_rid,
-				const char *group_name,
-				GROUP_MEM_FN(grp_mem))
-{
-	uint32 num_names = 0;
-	char **name = NULL;
-	uint32 *type = NULL;
-	uint32 *rid_mem = NULL;
-
-	if (sam_query_groupmem(cli, fnum, pol_dom, group_rid,
-				&num_names, &rid_mem, &name, &type))
-	{
-		grp_mem(domain, sid,
-		       group_rid, group_name,
-		       num_names, rid_mem, name, type);
-
-		free_char_array(num_names, name);
-		if (type != NULL)
-		{
-			free(type);
-		}
-		if (rid_mem != NULL)
-		{
-			free(rid_mem);
-		}
-		return True;
-	}
-	return False;
-}
-
-/****************************************************************************
-SAM Domains query.
-				DOMAIN_INFO_FN(dom_inf_fn),
-				DOMAIN_MEM_FN(dom_mem_fn))
-****************************************************************************/
-uint32 msrpc_sam_enum_domains(struct cli_state *cli,
-				const char* srv_name,
-				struct acct_info **sam,
-				uint32 *num_sam_entries,
-				DOMAIN_FN(dom_fn))
-{
-	uint16 fnum;
-	BOOL res = True;
-	uint32 ace_perms = 0x02000000; /* access control permissions. */
-	POLICY_HND sam_pol;
-	uint32 status;
-
-	/* open SAMR session.  negotiate credentials */
-	res = res ? cli_nt_session_open(cli, PIPE_SAMR, &fnum) : False;
-
-	/* establish a connection. */
-	res = res ? samr_connect(cli, fnum,
-				srv_name, ace_perms,
-				&sam_pol) : False;
-
-	(*sam) = NULL;
-	(*num_sam_entries) = 0;
-
-	if (res)
-	{
-		uint32 domain_idx;
-		uint32 start_idx = 0;
-		/* read some domains */
-		do
-		{
-			status = samr_enum_domains(cli, fnum, 
-			     &sam_pol,
-			     &start_idx, 0x10000,
-			     sam, num_sam_entries);
-
-		} while (status == STATUS_MORE_ENTRIES);
-
-		if ((*num_sam_entries) == 0)
-		{
-			report(out_hnd, "No domains\n");
-		}
-
-		for (domain_idx = 0; domain_idx < (*num_sam_entries); domain_idx++)
-		{
-			char *domain_name = (*sam)[domain_idx].acct_name;
-
-			if (dom_fn != NULL)
-			{
-				dom_fn(domain_name);
-			}
-
-#if 0
-			if (dom_inf_fn != NULL)
-			{
-				query_domaininfo(cli, fnum, &sam_pol,
-				                  domain_name,
-				                  dom_inf_fn);
-			}
-			if (dom_mem_fn != NULL)
-			{
-				req_domainmem_info(cli, fnum, &sam_pol,
-				                  domain_name,
-				                  dom_mem_fn);
-			}
-#endif
-		}
-	}
-
-	res = res ? samr_close(cli, fnum, &sam_pol) : False;
-
-	/* close the session */
-	cli_nt_session_close(cli, fnum);
-
-	if (res)
-	{
-		DEBUG(5,("msrpc_sam_enum_domains: succeeded\n"));
-	}
-	else
-	{
-		DEBUG(5,("msrpc_sam_enum_domains: failed\n"));
-	}
-	return (*num_sam_entries);
-}
-
-/****************************************************************************
-SAM groups query.
-****************************************************************************/
-uint32 msrpc_sam_enum_groups(struct cli_state *cli,
-				const char* domain,
-				const DOM_SID *sid1,
-				const char* srv_name,
-				struct acct_info **sam,
-				uint32 *num_sam_entries,
-				GROUP_FN(grp_fn),
-				GROUP_INFO_FN(grp_inf_fn),
-				GROUP_MEM_FN(grp_mem_fn))
-{
-	uint16 fnum;
-	BOOL res = True;
-	uint32 ace_perms = 0x02000000; /* access control permissions. */
-	POLICY_HND sam_pol;
-	POLICY_HND pol_dom;
-	uint32 status;
-
-	/* open SAMR session.  negotiate credentials */
-	res = res ? cli_nt_session_open(cli, PIPE_SAMR, &fnum) : False;
-
-	/* establish a connection. */
-	res = res ? samr_connect(cli, fnum,
-				srv_name, 0x02000000,
-				&sam_pol) : False;
-
-	/* connect to the domain */
-	res = res ? samr_open_domain(cli, fnum,
-	            &sam_pol, ace_perms, sid1,
-	            &pol_dom) : False;
-
-	(*sam) = NULL;
-	(*num_sam_entries) = 0;
-
-	if (res)
-	{
-		uint32 group_idx;
-		uint32 start_idx = 0;
-		/* read some groups */
-		do
-		{
-			status = samr_enum_dom_groups(cli, fnum, 
-			     &pol_dom,
-			     &start_idx, 0x100000,
-			     sam, num_sam_entries);
-
-		} while (status == STATUS_MORE_ENTRIES);
-
-		if ((*num_sam_entries) == 0)
-		{
-			report(out_hnd, "No groups\n");
-		}
-
-		for (group_idx = 0; group_idx < (*num_sam_entries); group_idx++)
-		{
-			uint32 group_rid = (*sam)[group_idx].rid;
-			char *group_name = (*sam)[group_idx].acct_name;
-
-			if (grp_fn != NULL)
-			{
-				grp_fn(domain, sid1, group_rid, group_name);
-			}
-
-			if (grp_inf_fn != NULL)
-			{
-				query_groupinfo(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  group_rid, 
-				                  grp_inf_fn);
-			}
-			if (grp_mem_fn != NULL)
-			{
-				req_groupmem_info(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  group_rid, group_name,
-				                  grp_mem_fn);
-			}
-		}
-	}
-
-	res = res ? samr_close(cli, fnum, &pol_dom) : False;
-	res = res ? samr_close(cli, fnum, &sam_pol) : False;
-
-	/* close the session */
-	cli_nt_session_close(cli, fnum);
-
-	if (res)
-	{
-		DEBUG(5,("msrpc_sam_enum_groups: succeeded\n"));
-	}
-	else
-	{
-		DEBUG(5,("msrpc_sam_enum_groups: failed\n"));
-	}
-	return (*num_sam_entries);
-}
-
-/****************************************************************************
-SAM aliases query.
-****************************************************************************/
-uint32 msrpc_sam_enum_aliases(struct cli_state *cli,
-				const char* domain,
-				const DOM_SID *sid1,
-				const char* srv_name,
-				struct acct_info **sam,
-				uint32 *num_sam_entries,
-				ALIAS_FN(als_fn),
-				ALIAS_INFO_FN(als_inf_fn),
-				ALIAS_MEM_FN(als_mem_fn))
-{
-	uint16 fnum;
-	BOOL res = True;
-	uint32 ace_perms = 0x02000000; /* access control permissions */
-	POLICY_HND sam_pol;
-	POLICY_HND pol_dom;
-	uint32 status = 0x0;
-
-	/* open SAMR session.  negotiate credentials */
-	res = res ? cli_nt_session_open(cli, PIPE_SAMR, &fnum) : False;
-
-	/* establish a connection. */
-	res = res ? samr_connect(cli, fnum,
-				srv_name, 0x02000000,
-				&sam_pol) : False;
-
-	/* connect to the domain */
-	res = res ? samr_open_domain(cli, fnum,
-	            &sam_pol, ace_perms, sid1,
-	            &pol_dom) : False;
-
-	(*sam) = NULL;
-	(*num_sam_entries) = 0;
-
-	if (res)
-	{
-		uint32 alias_idx;
-		uint32 start_idx = 0;
-		/* read some groups */
-		do
-		{
-			status = samr_enum_dom_aliases(cli, fnum, 
-			     &pol_dom,
-			     &start_idx, 0x100000,
-			     sam, num_sam_entries);
-
-		} while (status == STATUS_MORE_ENTRIES);
-
-		if ((*num_sam_entries) == 0)
-		{
-			report(out_hnd, "No aliases\n");
-		}
-
-		for (alias_idx = 0; alias_idx < (*num_sam_entries); alias_idx++)
-		{
-			uint32 alias_rid = (*sam)[alias_idx].rid;
-			char *alias_name = (*sam)[alias_idx].acct_name;
-
-			if (als_fn != NULL)
-			{
-				als_fn(domain, sid1, alias_rid, alias_name);
-			}
-
-			if (als_inf_fn != NULL)
-			{
-				query_aliasinfo(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  alias_rid, 
-				                  als_inf_fn);
-			}
-			if (als_mem_fn != NULL)
-			{
-				req_aliasmem_info(cli, fnum, &pol_dom,
-				                  domain, sid1,
-				                  alias_rid, alias_name,
-				                  als_mem_fn);
-			}
-		}
-	}
-
-	res = res ? samr_close(cli, fnum, &sam_pol) : False;
-	res = res ? samr_close(cli, fnum, &pol_dom) : False;
-
-	/* close the session */
-	cli_nt_session_close(cli, fnum);
-
-	if (res)
-	{
-		DEBUG(5,("msrpc_sam_enum_aliases: succeeded\n"));
-	}
-	else
-	{
-		DEBUG(5,("msrpc_sam_enum_aliases: failed\n"));
-	}
-
-	return (*num_sam_entries);
-}
 
 /****************************************************************************
 SAM password change