Remove some more hand written LSA rpc.

(rpccli_lsa_open_trusted_domain,
rpccli_lsa_query_trusted_domain_info,
cli_lsa_query_domain_info_policy).

Guenther

diff --git a/source/rpc_client/cli_lsarpc.c b/source/rpc_client/cli_lsarpc.c
index 70123ebcc677706d6288a442d4e690b33a049539..a023fe75efac824e5b2dab9679f6a38214aa2fda 100644 (file)
--- a/source/rpc_client/cli_lsarpc.c
+++ b/source/rpc_client/cli_lsarpc.c
@@ -1468,111 +1468,3 @@ Error was : %s.\n", remote_machine, cli_errstr(&cli) ));
 }
 
 #endif
-
-NTSTATUS rpccli_lsa_open_trusted_domain(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                    POLICY_HND *pol, DOM_SID *dom_sid, uint32 access_mask,
-                                    POLICY_HND *trustdom_pol)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_OPEN_TRUSTED_DOMAIN q;
-       LSA_R_OPEN_TRUSTED_DOMAIN r;
-       NTSTATUS result;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Initialise input parameters */
-
-       init_lsa_q_open_trusted_domain(&q, pol, dom_sid, access_mask);
-
-       /* Marshall data and send request */
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_OPENTRUSTDOM,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_open_trusted_domain,
-               lsa_io_r_open_trusted_domain,
-               NT_STATUS_UNSUCCESSFUL);
-
-       /* Return output parameters */
-
-       result = r.status;
-
-       if (NT_STATUS_IS_OK(result)) {
-               *trustdom_pol = r.handle;
-       }
-
-       return result;
-}
-
-NTSTATUS rpccli_lsa_query_trusted_domain_info(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                          POLICY_HND *pol,
-                                          uint16 info_class,
-                                          LSA_TRUSTED_DOMAIN_INFO **info)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_QUERY_TRUSTED_DOMAIN_INFO q;
-       LSA_R_QUERY_TRUSTED_DOMAIN_INFO r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-
-       init_q_query_trusted_domain_info(&q, pol, info_class);
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_QUERYTRUSTDOMINFO,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_query_trusted_domain_info,
-               lsa_io_r_query_trusted_domain_info,
-               NT_STATUS_UNSUCCESSFUL);
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-
-       *info = r.info;
-
-done:
-       return result;
-}
-
-NTSTATUS cli_lsa_query_domain_info_policy(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
-                                         POLICY_HND *pol,
-                                         uint16 info_class, LSA_DOM_INFO_UNION **info)
-{
-       prs_struct qbuf, rbuf;
-       LSA_Q_QUERY_DOM_INFO_POLICY q;
-       LSA_R_QUERY_DOM_INFO_POLICY r;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-       ZERO_STRUCT(q);
-       ZERO_STRUCT(r);
-
-       /* Marshall data and send request */
-
-       init_q_query_dom_info(&q, pol, info_class);
-
-       CLI_DO_RPC( cli, mem_ctx, PI_LSARPC, LSA_QUERYDOMINFOPOL,
-               q, r,
-               qbuf, rbuf,
-               lsa_io_q_query_dom_info,
-               lsa_io_r_query_dom_info,
-               NT_STATUS_UNSUCCESSFUL);
-
-       result = r.status;
-
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-
-       *info = r.info;
-
-done:
-       return result;
-}
-

diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index a6d065f5032443079b807eba4310bfaf5974293b..2e48c3fa7487e3f5fda5d7650d3b8a769967262c 100644 (file)
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -1051,9 +1051,12 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
-       
-       result = rpccli_lsa_open_trusted_domain(cli, mem_ctx, &pol,
-                                            &dom_sid, access_mask, &trustdom_pol);
+
+       result = rpccli_lsa_OpenTrustedDomain(cli, mem_ctx,
+                                             &pol,
+                                             &dom_sid,
+                                             access_mask,
+                                             &trustdom_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;