make querygroup in rpcclient working, same fix as per 2.2 tree

(This used to be commit 8877ff2482bfa880614a9f40eed448d60216419d)

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 7863d32419b3ea9a23ff7c450d4efafc069c6f0c..d101b8fe21896405e0f0fab9f7bc1670b8a8fe86 100644 (file)
--- 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 7cc6e24d706a08a7aa84417217e61e4a91697dd2..246e74dc359b7a9d3f36c2f9ea4103b6b2e8b0db 100644 (file)
--- 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;