summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2002-12-08 11:56:45 +0000
committerSimo Sorce <idra@samba.org>2002-12-08 11:56:45 +0000
commita543e6ea629df5ed66c01eaafe89352f86785ff6 (patch)
treed67a61afd85a11a70cf060051a7a59c2f57da052 /source3
parenteeeb898fef25683218ef39199a02e1b45b7f951a (diff)
downloadsamba-a543e6ea629df5ed66c01eaafe89352f86785ff6.tar.gz
samba-a543e6ea629df5ed66c01eaafe89352f86785ff6.tar.bz2
samba-a543e6ea629df5ed66c01eaafe89352f86785ff6.zip
make querygroup in rpcclient working, same fix as per 2.2 tree
(This used to be commit 8877ff2482bfa880614a9f40eed448d60216419d)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_client/cli_samr.c6
-rw-r--r--source3/rpcclient/cmd_samr.c6
2 files changed, 5 insertions, 7 deletions
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 7863d32419..d101b8fe21 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -358,7 +358,7 @@ NTSTATUS cli_samr_query_userinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
NTSTATUS cli_samr_query_groupinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *group_pol, uint32 info_level,
- GROUP_INFO_CTR *ctr)
+ GROUP_INFO_CTR **ctr)
{
prs_struct qbuf, rbuf;
SAMR_Q_QUERY_GROUPINFO q;
@@ -383,11 +383,11 @@ NTSTATUS cli_samr_query_groupinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
/* Unmarshall response */
- r.ctr = ctr;
-
if (!samr_io_r_query_groupinfo("", &r, &rbuf, 0))
goto done;
+ *ctr = r.ctr;
+
/* Return output parameters */
result = r.status;
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 7cc6e24d70..246e74dc35 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -379,7 +379,7 @@ static NTSTATUS cmd_samr_query_group(struct cli_state *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint32 info_level = 1;
uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
- GROUP_INFO_CTR group_ctr;
+ GROUP_INFO_CTR *group_ctr;
fstring server;
uint32 group_rid;
@@ -419,15 +419,13 @@ static NTSTATUS cmd_samr_query_group(struct cli_state *cli,
if (!NT_STATUS_IS_OK(result))
goto done;
- ZERO_STRUCT(group_ctr);
-
result = cli_samr_query_groupinfo(cli, mem_ctx, &group_pol,
info_level, &group_ctr);
if (!NT_STATUS_IS_OK(result)) {
goto done;
}
- display_group_info_ctr(&group_ctr);
+ display_group_info_ctr(group_ctr);
done:
return result;