s3:lib/netapi: do not use rpc_pipe_np_smb_conn()

[mat/samba.git] / source3 / lib / netapi / cm.c

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 3adb97e3575569a9463b065815f9cd5a54c6aabc..dbb6b6f02d181f6e9499c0d1341d695ea0de8462 100644 (file)
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -18,12 +18,13 @@
  */
 
 #include "includes.h"
-#include "popt_common.h"
+#include "auth_info.h"
 
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "libsmb/libsmb.h"
 #include "rpc_client/cli_pipe.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /********************************************************************
 ********************************************************************/
@@ -48,7 +49,9 @@ static struct client_ipc_connection *ipc_cm_find(
        struct client_ipc_connection *p;
 
        for (p = priv_ctx->ipc_connections; p; p = p->next) {
-               if (strequal(p->cli->desthost, server_name)) {
+               const char *remote_name = smbXcli_conn_remote_name(p->cli->conn);
+
+               if (strequal(remote_name, server_name)) {
                        return p;
                }
        }
@@ -67,6 +70,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
        struct user_auth_info *auth_info = NULL;
        struct cli_state *cli_ipc = NULL;
        struct client_ipc_connection *p;
+       NTSTATUS status;
 
        if (!ctx || !pp || !server_name) {
                return WERR_INVALID_PARAM;
@@ -84,7 +88,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
        if (!auth_info) {
                return WERR_NOMEM;
        }
-       auth_info->signing_state = Undefined;
+       auth_info->signing_state = SMB_SIGNING_DEFAULT;
        set_cmdline_auth_info_use_kerberos(auth_info, ctx->use_kerberos);
        set_cmdline_auth_info_username(auth_info, ctx->username);
        if (ctx->password) {
@@ -103,16 +107,18 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
                set_cmdline_auth_info_use_ccache(auth_info, true);
        }
 
-       cli_ipc = cli_cm_open(ctx, NULL,
-                               server_name, "IPC$",
-                               auth_info,
-                               false, false,
-                               PROTOCOL_NT1,
-                               0, 0x20);
-       if (cli_ipc) {
+       status = cli_cm_open(ctx, NULL,
+                            server_name, "IPC$",
+                            auth_info,
+                            false, false,
+                            lp_cli_maxprotocol(),
+                            0, 0x20, &cli_ipc);
+       if (NT_STATUS_IS_OK(status)) {
                cli_set_username(cli_ipc, ctx->username);
                cli_set_password(cli_ipc, ctx->password);
                cli_set_domain(cli_ipc, ctx->workgroup);
+       } else {
+               cli_ipc = NULL;
        }
        TALLOC_FREE(auth_info);
 
@@ -155,20 +161,23 @@ WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx)
 ********************************************************************/
 
 static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
-                            const struct ndr_syntax_id *interface,
+                            const struct ndr_interface_table *table,
                             struct rpc_pipe_client **presult)
 {
        struct client_pipe_connection *p;
 
        for (p = ipc->pipe_connections; p; p = p->next) {
+               const char *ipc_remote_name;
 
-               if (!rpc_pipe_np_smb_conn(p->pipe)) {
+               if (!rpccli_is_connected(p->pipe)) {
                        return NT_STATUS_PIPE_EMPTY;
                }
 
-               if (strequal(ipc->cli->desthost, p->pipe->desthost)
+               ipc_remote_name = smbXcli_conn_remote_name(ipc->cli->conn);
+
+               if (strequal(ipc_remote_name, p->pipe->desthost)
                    && ndr_syntax_id_equal(&p->pipe->abstract_syntax,
-                                          interface)) {
+                                          &table->syntax_id)) {
                        *presult = p->pipe;
                        return NT_STATUS_OK;
                }
@@ -182,18 +191,18 @@ static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
 
 static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
                                struct client_ipc_connection *ipc,
-                               const struct ndr_syntax_id *interface,
+                               const struct ndr_interface_table *table,
                                struct rpc_pipe_client **presult)
 {
        struct client_pipe_connection *p;
        NTSTATUS status;
 
-       p = TALLOC_ZERO_ARRAY(mem_ctx, struct client_pipe_connection, 1);
+       p = talloc_zero_array(mem_ctx, struct client_pipe_connection, 1);
        if (!p) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = cli_rpc_pipe_open_noauth(ipc->cli, interface, &p->pipe);
+       status = cli_rpc_pipe_open_noauth(ipc->cli, table, &p->pipe);
        if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(p);
                return status;
@@ -210,14 +219,14 @@ static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
 
 static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
                             struct client_ipc_connection *ipc,
-                            const struct ndr_syntax_id *interface,
+                            const struct ndr_interface_table *table,
                             struct rpc_pipe_client **presult)
 {
-       if (NT_STATUS_IS_OK(pipe_cm_find(ipc, interface, presult))) {
+       if (NT_STATUS_IS_OK(pipe_cm_find(ipc, table, presult))) {
                return NT_STATUS_OK;
        }
 
-       return pipe_cm_connect(ctx, ipc, interface, presult);
+       return pipe_cm_connect(ctx, ipc, table, presult);
 }
 
 /********************************************************************
@@ -225,7 +234,7 @@ static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
 
 WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
                           const char *server_name,
-                          const struct ndr_syntax_id *interface,
+                          const struct ndr_interface_table *table,
                           struct rpc_pipe_client **presult)
 {
        struct rpc_pipe_client *result = NULL;
@@ -242,10 +251,10 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
                return werr;
        }
 
-       status = pipe_cm_open(ctx, ipc, interface, &result);
+       status = pipe_cm_open(ctx, ipc, table, &result);
        if (!NT_STATUS_IS_OK(status)) {
                libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",
-                       get_pipe_name_from_syntax(talloc_tos(), interface),
+                       table->name,
                        get_friendly_nt_error_msg(status));
                return WERR_DEST_NOT_FOUND;
        }
@@ -260,7 +269,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
 
 WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
                                    const char *server_name,
-                                   const struct ndr_syntax_id *interface,
+                                   const struct ndr_interface_table *table,
                                    struct dcerpc_binding_handle **binding_handle)
 {
        struct rpc_pipe_client *pipe_cli;
@@ -268,7 +277,7 @@ WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
 
        *binding_handle = NULL;
 
-       result = libnetapi_open_pipe(ctx, server_name, interface, &pipe_cli);
+       result = libnetapi_open_pipe(ctx, server_name, table, &pipe_cli);
        if (!W_ERROR_IS_OK(result)) {
                return result;
        }