Use rpccli_samr_OpenGroup() all over the place.

Guenther
(This used to be commit d019fc69a986937880121c2587d3fe37f995edae)

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 53337e6ca4d325119eb2e495c61caf7fa324acd2..c9c18bd6cc55cebd149fda2d22a6ac4c7cc35efa 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -577,9 +577,11 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_group(cli, mem_ctx, &domain_pol,
-                                    access_mask,
-                                    group_rid, &group_pol);
+       result = rpccli_samr_OpenGroup(cli, mem_ctx,
+                                      &domain_pol,
+                                      access_mask,
+                                      group_rid,
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -804,9 +806,11 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_group(cli, mem_ctx, &domain_pol,
-                                    access_mask,
-                                    group_rid, &group_pol);
+       result = rpccli_samr_OpenGroup(cli, mem_ctx,
+                                      &domain_pol,
+                                      access_mask,
+                                      group_rid,
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1866,9 +1870,11 @@ static NTSTATUS cmd_samr_delete_dom_group(struct rpc_pipe_client *cli,
                if (!NT_STATUS_IS_OK(result))
                        goto done;
 
-               result = rpccli_samr_open_group(cli, mem_ctx, &domain_pol,
-                                               access_mask,
-                                               group_rids[0], &group_pol);
+               result = rpccli_samr_OpenGroup(cli, mem_ctx,
+                                              &domain_pol,
+                                              access_mask,
+                                              group_rids[0],
+                                              &group_pol);
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 4826c4bedc9e00e09aae05625bb0cbc121975c59..7ce88c13c68b0f64ff798376d2dbc56708713d35 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1790,9 +1790,11 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
        switch (name_types[0])
        {
        case SID_NAME_DOM_GRP:
-               result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
-                                            MAXIMUM_ALLOWED_ACCESS,
-                                            group_rids[0], &group_pol);
+               result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
+                                              &domain_pol,
+                                              MAXIMUM_ALLOWED_ACCESS,
+                                              group_rids[0],
+                                              &group_pol);
                if (!NT_STATUS_IS_OK(result)) {
                        d_fprintf(stderr, "Request open_group failed");
                        goto done;
@@ -2148,9 +2150,11 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
                goto done;
        }
 
-       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS,
-                                    group_rid, &group_pol);
+       result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
+                                      &domain_pol,
+                                      MAXIMUM_ALLOWED_ACCESS,
+                                      group_rid,
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -2330,9 +2334,11 @@ static NTSTATUS rpc_del_groupmem(struct rpc_pipe_client *pipe_hnd,
                goto done;
        }
 
-       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS,
-                                    group_rid, &group_pol);
+       result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
+                                      &domain_pol,
+                                      MAXIMUM_ALLOWED_ACCESS,
+                                      group_rid,
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2710,9 +2716,11 @@ static NTSTATUS rpc_list_group_members(struct rpc_pipe_client *pipe_hnd,
        fstring sid_str;
        sid_to_fstring(sid_str, domain_sid);
 
-       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS,
-                                    rid, &group_pol);
+       result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
+                                      domain_pol,
+                                      MAXIMUM_ALLOWED_ACCESS,
+                                      rid,
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -2983,9 +2991,11 @@ static NTSTATUS rpc_group_rename_internals(const DOM_SID *domain_sid,
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS,
-                                    rids[0], &group_pol);
+       result = rpccli_samr_OpenGroup(pipe_hnd, mem_ctx,
+                                      &domain_pol,
+                                      MAXIMUM_ALLOWED_ACCESS,
+                                      rids[0],
+                                      &group_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 47a8d430b2d7f2a148ed8c2970420b6668f23a82..b8f198286850031768092a3d9adcf83511755f3d 100644 (file)
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -700,8 +700,11 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
        if (!NT_STATUS_IS_OK(result))
                return result;
 
-        result = rpccli_samr_open_group(cli, mem_ctx, &dom_pol,
-                                       des_access, group_rid, &group_pol);
+        result = rpccli_samr_OpenGroup(cli, mem_ctx,
+                                      &dom_pol,
+                                      des_access,
+                                      group_rid,
+                                      &group_pol);
 
         if (!NT_STATUS_IS_OK(result))
                return result;