Changeset 988 for vendor/current/source3/lib/netapi/cm.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/netapi/cm.c (modified) (16 diffs)

vendor/current/source3/lib/netapi/cm.c

@@ -19 +19 @@
 
 #include "includes.h"
-#include "popt_common.h"
+#include ".h"
 
 #include "lib/netapi/netapi.h"
@@ -25 +25 @@
 #include "libsmb/libsmb.h"
 #include "rpc_client/cli_pipe.h"
+
 
 /********************************************************************
@@ -49 +50 @@
 
         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;
                 }
@@ -64 +67 @@
                                             struct client_ipc_connection **pp)
 {
-        struct libnetapi_private_ctx *priv_ctx =
-                (struct libnetapi_private_ctx *)ctx->private_data;
+        struct libnetapi_private_ctx *priv_ctx;
         struct user_auth_info *auth_info = NULL;
         struct cli_state *cli_ipc = NULL;
         struct client_ipc_connection *p;
+
 
         if (!ctx || !pp || !server_name) {
                 return WERR_INVALID_PARAM;
         }
+
+
 
         p = ipc_cm_find(priv_ctx, server_name);
@@ -84 +89 @@
                 return WERR_NOMEM;
         }
-        auth_info->signing_state = Undefined;
+        auth_info->signing_state = ;
         set_cmdline_auth_info_use_kerberos(auth_info, ctx->use_kerberos);
         set_cmdline_auth_info_username(auth_info, ctx->username);
@@ -103 +108 @@
         }
 
-        cli_ipc = cli_cm_open(ctx, NULL,
-                                server_name, "IPC$",
-                                auth_info,
-                                false, false,
-                                PROTOCOL_NT1,
-                                0, 0x20);
-        if (cli_ipc) {
-                cli_set_username(cli_ipc, ctx->username);
-                cli_set_password(cli_ipc, ctx->password);
-                cli_set_domain(cli_ipc, ctx->workgroup);
+        status = cli_cm_open(ctx, NULL,
+                             server_name, "IPC$",
+                             auth_info,
+                             false, false,
+                             lp_client_max_protocol(),
+                             0, 0x20, &cli_ipc);
+        if (!NT_STATUS_IS_OK(status)) {
+                cli_ipc = NULL;
         }
         TALLOC_FREE(auth_info);
@@ -122 +125 @@
         }
 
-        p = TALLOC_ZERO_P(ctx, struct client_ipc_connection);
+        p = (ctx, struct client_ipc_connection);
         if (p == NULL) {
                 return WERR_NOMEM;
@@ -155 +158 @@
 
 static NTSTATUS pipe_cm_find(struct client_ipc_connection *ipc,
-                             const struct ndr_syntax_id *interface,
+                             const struct ndr_e,
                              struct rpc_pipe_client **presult)
 {
@@ -161 +164 @@
 
         for (p = ipc->pipe_connections; p; p = p->next) {
-
-                if (!rpc_pipe_np_smb_conn(p->pipe)) {
+                const char *ipc_remote_name;
+
+                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)) {
+                                           )) {
                         *presult = p->pipe;
                         return NT_STATUS_OK;
@@ -182 +188 @@
 static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
                                 struct client_ipc_connection *ipc,
-                                const struct ndr_syntax_id *interface,
+                                const struct ndr_e,
                                 struct rpc_pipe_client **presult)
 {
@@ -188 +194 @@
         NTSTATUS status;
 
-        p = TALLOC_ZERO_ARRAY(mem_ctx, struct client_pipe_connection, 1);
+        p = (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, e, &p->pipe);
         if (!NT_STATUS_IS_OK(status)) {
                 TALLOC_FREE(p);
@@ -210 +216 @@
 static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
                              struct client_ipc_connection *ipc,
-                             const struct ndr_syntax_id *interface,
+                             const struct ndr_e,
                              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, e, presult))) {
                 return NT_STATUS_OK;
         }
 
-        return pipe_cm_connect(ctx, ipc, interface, presult);
+        return pipe_cm_connect(ctx, ipc, e, presult);
 }
 
@@ -225 +231 @@
 WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
                            const char *server_name,
-                           const struct ndr_syntax_id *interface,
+                           const struct ndr_e,
                            struct rpc_pipe_client **presult)
 {
@@ -242 +248 @@
         }
 
-        status = pipe_cm_open(ctx, ipc, interface, &result);
+        status = pipe_cm_open(ctx, ipc, e, &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),
+                        ,
                         get_friendly_nt_error_msg(status));
                 return WERR_DEST_NOT_FOUND;
@@ -260 +266 @@
 WERROR libnetapi_get_binding_handle(struct libnetapi_ctx *ctx,
                                     const char *server_name,
-                                    const struct ndr_syntax_id *interface,
+                                    const struct ndr_e,
                                     struct dcerpc_binding_handle **binding_handle)
 {
@@ -268 +274 @@
         *binding_handle = NULL;
 
-        result = libnetapi_open_pipe(ctx, server_name, interface, &pipe_cli);
+        result = libnetapi_open_pipe(ctx, server_name, e, &pipe_cli);
         if (!W_ERROR_IS_OK(result)) {
                 return result;