Changeset 988 for vendor/current/source4/libcli/cliconnect.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/source4/libcli/cliconnect.c (modified) (5 diffs)

vendor/current/source4/libcli/cliconnect.c

@@ -27 +27 @@
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "libcli/smb/smbXcli_base.h"
 
 /*
@@ -36 +37 @@
                            struct resolve_context *resolve_ctx,
                            struct smbcli_options *options,
-               const char *socket_options)
-{
-        struct smbcli_socket *sock;
-
-        sock = smbcli_sock_connect_byname(server, ports, NULL,
-                                          resolve_ctx, ev_ctx,
-                      socket_options);
-
-        if (sock == NULL) return false;
-        
-        cli->transport = smbcli_transport_init(sock, cli, true, options);
-        if (!cli->transport) {
+                           const char *socket_options,
+                           struct nbt_name *calling,
+                           struct nbt_name *called)
+{
+        NTSTATUS status;
+
+        cli->options = *options;
+
+        status = smbcli_sock_connect(cli,
+                                     NULL, /* host_addr */
+                                     ports,
+                                     server,
+                                     resolve_ctx,
+                                     ev_ctx,
+                                     socket_options,
+                                     calling,
+                                     called,
+                                     &cli->sock);
+        if (!NT_STATUS_IS_OK(status)) {
                 return false;
         }
 
         return true;
-}
-
-/* wrapper around smbcli_transport_connect() */
-bool smbcli_transport_establish(struct smbcli_state *cli, 
-                                struct nbt_name *calling,
-                                struct nbt_name *called)
-{
-        return smbcli_transport_connect(cli->transport, calling, called);
 }
 
@@ -65 +65 @@
 NTSTATUS smbcli_negprot(struct smbcli_state *cli, bool unicode, int maxprotocol)
 {
-        return smb_raw_negotiate(cli->transport, unicode, maxprotocol);
+        if (unicode) {
+                cli->options.unicode = 1;
+        } else {
+                cli->options.unicode = 0;
+        }
+
+        cli->transport = smbcli_transport_init(cli->sock, cli,
+                                               true, &cli->options);
+        cli->sock = NULL;
+        if (!cli->transport) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        return smb_raw_negotiate(cli->transport, unicode, PROTOCOL_CORE, maxprotocol);
 }
 
@@ -113 +126 @@
         /* setup a tree connect */
         tcon.generic.level = RAW_TCON_TCONX;
-        tcon.tconx.in.flags = 0;
+        tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
+        tcon.tconx.in.flags |= TCONX_FLAG_EXTENDED_SIGNATURES;
         if (cli->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_USER_LEVEL) {
                 tcon.tconx.in.password = data_blob(NULL, 0);
@@ -131 +145 @@
 
         cli->tree->tid = tcon.tconx.out.tid;
+
+        if (tcon.tconx.out.options & SMB_EXTENDED_SIGNATURES) {
+                smb1cli_session_protect_session_key(cli->tree->session->smbXcli);
+        }
 
         talloc_free(mem_ctx);