Use rpccli_samr_OpenUser() all over the place.

Guenther
(This used to be commit da90eb7653554d242da83ed98adae35ced3a2938)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index cea5ea6d46535f44ceb2ba2622989ac6d2a69534..bbbf11adc1954bf9eba1a181d585daf722ea6b48 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -724,9 +724,11 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 
        user_rid = user_rids[0];
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid,
-                                      &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -869,9 +871,11 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
 
        user_rid = user_rids[0];
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                      user_rid, &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 68e8d2688658b2c9bf00cea712fb98429951f715..93aca9f15fa281545f15b59ea4d2b253de414b2f 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -382,9 +382,11 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_user(cli, mem_ctx, &domain_pol,
-                                   access_mask,
-                                   user_rid, &user_pol);
+       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                     &domain_pol,
+                                     access_mask,
+                                     user_rid,
+                                     &user_pol);
 
        if (NT_STATUS_EQUAL(result, NT_STATUS_NO_SUCH_USER) &&
            (user_rid == 0)) {
@@ -399,10 +401,11 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
                                                  &types);
 
                if (NT_STATUS_IS_OK(result)) {
-                       result = rpccli_samr_open_user(cli, mem_ctx,
-                                                      &domain_pol,
-                                                      access_mask,
-                                                      rids[0], &user_pol);
+                       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                                     &domain_pol,
+                                                     access_mask,
+                                                     rids[0],
+                                                     &user_pol);
                }
        }
 
@@ -645,9 +648,11 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_user(cli, mem_ctx, &domain_pol,
-                                   access_mask,
-                                   user_rid, &user_pol);
+       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                     &domain_pol,
+                                     access_mask,
+                                     user_rid,
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1952,9 +1957,11 @@ static NTSTATUS cmd_samr_delete_dom_user(struct rpc_pipe_client *cli,
                if (!NT_STATUS_IS_OK(result))
                        goto done;
 
-               result = rpccli_samr_open_user(cli, mem_ctx, &domain_pol,
-                                           access_mask,
-                                           user_rids[0], &user_pol);
+               result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                             &domain_pol,
+                                             access_mask,
+                                             user_rids[0],
+                                             &user_pol);
 
                if (!NT_STATUS_IS_OK(result))
                        goto done;
@@ -2033,9 +2040,11 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
                goto done;
 
        if (user_rid)
-               result = rpccli_samr_open_user(cli, mem_ctx, &domain_pol,
-                                           MAXIMUM_ALLOWED_ACCESS,
-                                           user_rid, &user_pol);
+               result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                             &domain_pol,
+                                             MAXIMUM_ALLOWED_ACCESS,
+                                             user_rid,
+                                             &user_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2101,9 +2110,11 @@ static NTSTATUS cmd_samr_get_usrdom_pwinfo(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       result = rpccli_samr_open_user(cli, mem_ctx, &domain_pol,
-                                      MAXIMUM_ALLOWED_ACCESS,
-                                      rid, &user_pol);
+       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                     &domain_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     rid,
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;

diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index 15764e47f6b71e764eab95cbf7e4be6dde8aff8c..93b9d0bc252f8339297cde9e25a9818c52455952 100644 (file)
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -101,8 +101,11 @@ NTSTATUS netdom_leave_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
                
        /* Open handle on user */
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid, &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if ( !NT_STATUS_IS_OK(status) ) {
                goto done;
        }
@@ -298,8 +301,11 @@ NTSTATUS netdom_join_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
                
        /* Open handle on user */
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid, &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e5491f7cf621088de4ca21cc96d6bb72df8eb718..eb21741a953072c36954dc4b4d2a0bc3a10490dc 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -652,9 +652,11 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
                        goto done;
                }
 
-               result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                              MAXIMUM_ALLOWED_ACCESS,
-                                              user_rids[0], &user_pol);
+               result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                             &domain_pol,
+                                             MAXIMUM_ALLOWED_ACCESS,
+                                             user_rids[0],
+                                             &user_pol);
 
                if (!NT_STATUS_IS_OK(result)) {
                        goto done;
@@ -786,9 +788,11 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
                        goto done;
                }
 
-               result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                           MAXIMUM_ALLOWED_ACCESS,
-                                           user_rids[0], &user_pol);
+               result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                             &domain_pol,
+                                             MAXIMUM_ALLOWED_ACCESS,
+                                             user_rids[0],
+                                             &user_pol);
 
                if (!NT_STATUS_IS_OK(result)) {
                        goto done;
@@ -896,8 +900,11 @@ static NTSTATUS rpc_user_rename_internals(const DOM_SID *domain_sid,
        }
 
        /* Open domain user */
-       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                   MAXIMUM_ALLOWED_ACCESS, user_rid[0], &user_pol);
+       result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     user_rid[0],
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -1049,9 +1056,11 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
                        goto done;
                }
 
-               result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                           MAXIMUM_ALLOWED_ACCESS,
-                                           user_rids[0], &user_pol);
+               result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                             &domain_pol,
+                                             MAXIMUM_ALLOWED_ACCESS,
+                                             user_rids[0],
+                                             &user_pol);
 
                if (!NT_STATUS_IS_OK(result)) {
                        goto done;
@@ -1160,9 +1169,11 @@ static NTSTATUS rpc_user_info_internals(const DOM_SID *domain_sid,
 
        if (!NT_STATUS_IS_OK(result)) goto done;
 
-       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                   MAXIMUM_ALLOWED_ACCESS,
-                                   rids[0], &user_pol);
+       result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     rids[0],
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
        result = rpccli_samr_query_usergroups(pipe_hnd, mem_ctx, &user_pol,
@@ -1408,9 +1419,11 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                      MAXIMUM_ALLOWED_ACCESS,
-                                      rid, &user_pol);
+       result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1819,9 +1832,11 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
                /* Check if group is anyone's primary group */
                 for (i = 0; i < num_members; i++)
                {
-                       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                                   MAXIMUM_ALLOWED_ACCESS,
-                                                   group_rids[i], &user_pol);
+                       result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                                     &domain_pol,
+                                                     MAXIMUM_ALLOWED_ACCESS,
+                                                     group_rids[i],
+                                                     &user_pol);
        
                        if (!NT_STATUS_IS_OK(result)) {
                                d_fprintf(stderr, "Unable to open group member %d\n",group_rids[i]);
@@ -5603,9 +5618,11 @@ static NTSTATUS rpc_trustdom_del_internals(const DOM_SID *domain_sid,
                goto done;
        }
 
-       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                   MAXIMUM_ALLOWED_ACCESS,
-                                   user_rids[0], &user_pol);
+       result = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     user_rids[0],
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 41ee4f2c365ce8cee2d43e7b1a7782c55ee450c4..dbce7e9a43717935cb5bce8f4bdb258047491c7c 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -303,9 +303,11 @@ int net_rpc_join_newstyle(int argc, const char **argv)
        /* Open handle on user */
 
        CHECK_RPC_ERR_DEBUG(
-               rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                  SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                  user_rid, &user_pol),
+               rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                    &domain_pol,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    user_rid,
+                                    &user_pol),
                ("could not re-open existing user %s: %s\n",
                 acct_name, nt_errstr(result)));
        

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 59ca15a62373f2ef109b2061b6d0c0aeef358cba..14b1621fc997f430ccfa73ff43a8c9662a01045d 100644 (file)
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1339,10 +1339,11 @@ NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
                        goto done;
                }
 
-               status_tmp = rpccli_samr_open_user(samr_pipe, state->mem_ctx, 
-                                                  &samr_domain_handle,
-                                                  MAXIMUM_ALLOWED_ACCESS,
-                                                  my_info3->user_rid, &user_pol);
+               status_tmp = rpccli_samr_OpenUser(samr_pipe, state->mem_ctx,
+                                                 &samr_domain_handle,
+                                                 MAXIMUM_ALLOWED_ACCESS,
+                                                 my_info3->user_rid,
+                                                 &user_pol);
 
                if (!NT_STATUS_IS_OK(status_tmp)) {
                        DEBUG(3, ("could not open user handle on SAMR pipe: %s\n",

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index b8f198286850031768092a3d9adcf83511755f3d..0d937ef30e8612b4ab99f5b1b288fad0b76b92c4 100644 (file)
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -469,9 +469,11 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
                return result;
 
        /* Get user handle */
-       result = rpccli_samr_open_user(cli, mem_ctx, &dom_pol,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid,
-                                      &user_pol);
+       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                     &dom_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -545,8 +547,11 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                return result;
 
        /* Get user handle */
-       result = rpccli_samr_open_user(cli, mem_ctx, &dom_pol,
-                                       des_access, user_rid, &user_pol);
+       result = rpccli_samr_OpenUser(cli, mem_ctx,
+                                     &dom_pol,
+                                     des_access,
+                                     user_rid,
+                                     &user_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;