From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 1 Mar 2012 00:38:09 +0000 (+0100)
Subject: s3:libsmb: pass smb2 capabilities and client guid in cli_state_create()
X-Git-Tag: tdb-1.2.10~439
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dc1873ff530060850c48bd2bb3cff9ab86a6b95;p=thirdparty%2Fsamba.git

s3:libsmb: pass smb2 capabilities and client guid in cli_state_create()

metze

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 481d9f729b4..26fbd196163 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -25,6 +25,7 @@
 #include "../libcli/smb/smb_seal.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
+#include "../librpc/ndr/libndr.h"
 
 /*******************************************************************
  Setup the word count and byte count for a client smb message.
@@ -150,6 +151,8 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 	bool force_ascii = false;
 	bool use_level_II_oplocks = false;
 	uint32_t smb1_capabilities = 0;
+	uint32_t smb2_capabilities = 0;
+	struct GUID client_guid = GUID_random();
 
 	/* Check the effective uid - make sure we are not setuid */
 	if (is_setuid_root()) {
@@ -250,6 +253,8 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 		smb1_capabilities |= CAP_LEVEL_II_OPLOCKS;
 	}
 
+	smb2_capabilities = SMB2_CAP_ALL;
+
 	if (remote_realm) {
 		cli->remote_realm = talloc_strdup(cli, remote_realm);
 		if (cli->remote_realm == NULL) {
@@ -260,8 +265,8 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 	cli->conn = smbXcli_conn_create(cli, fd, remote_name,
 					signing_state,
 					smb1_capabilities,
-					NULL, /* client_guid */
-					0 /* smb1_capabilites */);
+					&client_guid,
+					smb2_capabilities);
 	if (cli->conn == NULL) {
 		goto error;
 	}