summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-02-07 13:07:07 +0100
committerGünther Deschner <gd@samba.org>2008-02-07 13:37:59 +0100
commitba9cda7ad910bcd22625d1f0a383627906a7cb13 (patch)
tree7882da9bea1d43774123710a7148ed4cbbd646b2
parentf7ad51084c87e5063e231c9bf024a354349d6a21 (diff)
downloadsamba-ba9cda7ad910bcd22625d1f0a383627906a7cb13.tar.gz
samba-ba9cda7ad910bcd22625d1f0a383627906a7cb13.tar.bz2
samba-ba9cda7ad910bcd22625d1f0a383627906a7cb13.zip
Use rpccli_samr_QueryAliasInfo() in net.
Guenther (This used to be commit 5bf6c8b6d83708ba2f11e72fc952e932f0db59a6)
-rw-r--r--source3/utils/net_rpc.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 560125b162..8530767d38 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -2700,25 +2700,25 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
for (i = 0; i < num_entries; i++) {
- char *description = NULL;
+ const char *description = NULL;
if (opt_long_list_entries) {
POLICY_HND alias_pol;
- ALIAS_INFO_CTR ctr;
+ union samr_AliasInfo *info = NULL;
if ((NT_STATUS_IS_OK(rpccli_samr_OpenAlias(pipe_hnd, mem_ctx,
&domain_pol,
0x8,
groups[i].rid,
&alias_pol))) &&
- (NT_STATUS_IS_OK(rpccli_samr_query_alias_info(pipe_hnd, mem_ctx,
- &alias_pol, 3,
- &ctr))) &&
+ (NT_STATUS_IS_OK(rpccli_samr_QueryAliasInfo(pipe_hnd, mem_ctx,
+ &alias_pol,
+ 3,
+ &info))) &&
(NT_STATUS_IS_OK(rpccli_samr_Close(pipe_hnd, mem_ctx,
&alias_pol)))) {
- description = unistr2_to_ascii_talloc(mem_ctx,
- ctr.alias.info3.description.string);
+ description = info->description.string;
}
}
@@ -2757,25 +2757,25 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
for (i = 0; i < num_entries; i++) {
- char *description = NULL;
+ const char *description = NULL;
if (opt_long_list_entries) {
POLICY_HND alias_pol;
- ALIAS_INFO_CTR ctr;
+ union samr_AliasInfo *info = NULL;
if ((NT_STATUS_IS_OK(rpccli_samr_OpenAlias(pipe_hnd, mem_ctx,
&domain_pol,
0x8,
groups[i].rid,
&alias_pol))) &&
- (NT_STATUS_IS_OK(rpccli_samr_query_alias_info(pipe_hnd, mem_ctx,
- &alias_pol, 3,
- &ctr))) &&
+ (NT_STATUS_IS_OK(rpccli_samr_QueryAliasInfo(pipe_hnd, mem_ctx,
+ &alias_pol,
+ 3,
+ &info))) &&
(NT_STATUS_IS_OK(rpccli_samr_Close(pipe_hnd, mem_ctx,
&alias_pol)))) {
- description = unistr2_to_ascii_talloc(mem_ctx,
- ctr.alias.info3.description.string);
+ description = info->description.string;
}
}