s3:rpc_client: make use of dcerpc_binding_handle_transport_session_key()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 77da0914d5cccd7116ca3b6f75cb4d0cd0107239)

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 0903c043a8491f5f9b9cab75ebb3d788b22ce432..a5693504cddb63f765af172e14011d135fc34293 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -1489,7 +1489,8 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
@@ -1559,7 +1560,8 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
@@ -1727,7 +1729,8 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Could not retrieve session key: %s\n", nt_errstr(status)));
                goto done;
@@ -2205,7 +2208,8 @@ static NTSTATUS cmd_lsa_query_secret(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -2293,7 +2297,8 @@ static NTSTATUS cmd_lsa_set_secret(struct rpc_pipe_client *cli,
        ZERO_STRUCT(new_val);
        ZERO_STRUCT(old_val);
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -2382,7 +2387,8 @@ static NTSTATUS cmd_lsa_retrieve_private_data(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -2444,7 +2450,8 @@ static NTSTATUS cmd_lsa_store_private_data(struct rpc_pipe_client *cli,
 
        ZERO_STRUCT(val);
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -2580,7 +2587,8 @@ static NTSTATUS cmd_lsa_create_trusted_domain_ex3(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                DBG_ERR("Could not retrieve session key: %s\n",
                        nt_errstr(status));
@@ -2694,7 +2702,8 @@ static NTSTATUS cmd_lsa_create_trusted_domain_ex2(struct rpc_pipe_client *cli,
                return NT_STATUS_OK;
        }
 
-       status = cli_get_session_key(mem_ctx, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, mem_ctx, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                DBG_ERR("Could not retrieve session key: %s\n",
                        nt_errstr(status));

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 8106ca90cf221c9fa3ba4453ca9e5b2111757c64..3f2adf52cda4b3715740d98243859b851848185b 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -3198,7 +3198,8 @@ static NTSTATUS cmd_samr_setuserinfo_int(struct rpc_pipe_client *cli,
                password_expired = atoi(argv[4]);
        }
 
-       status = cli_get_session_key(frame, cli, &session_key);
+       status = dcerpc_binding_handle_transport_session_key(
+                               b, frame, &session_key);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }