summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-25 06:57:23 +0200
committerStefan Metzmacher <metze@samba.org>2013-10-05 14:04:07 +0200
commit5736f134003f426530040e732a6acc1c86b33f5f (patch)
treee9e9e2e74e7a74d13eeb2779ad06c7bd8a7b6d93 /source4
parent4e99a0fbfeb1330f67059caaef25669410510617 (diff)
downloadsamba-5736f134003f426530040e732a6acc1c86b33f5f.tar.gz
samba-5736f134003f426530040e732a6acc1c86b33f5f.tar.bz2
samba-5736f134003f426530040e732a6acc1c86b33f5f.zip
s4:libcli:smb2: add the smb2_capabilities to the smbcli_options
and initialize them in lpcfg_smbcli_options() instead of in smb2_transport_init() as previously. This will allow us to control them from callers later. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/raw/libcliraw.h1
-rw-r--r--source4/libcli/smb2/transport.c5
-rw-r--r--source4/param/loadparm.c1
3 files changed, 3 insertions, 4 deletions
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index d2ff90d0e4..95e69431c1 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -100,6 +100,7 @@ struct smbcli_options {
uint16_t max_mux;
int request_timeout;
enum smb_signing_setting signing;
+ uint32_t smb2_capabilities;
struct GUID client_guid;
};
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 380c9cd2d1..b4a6c943dd 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -59,16 +59,13 @@ struct smb2_transport *smb2_transport_init(struct smbcli_socket *sock,
TALLOC_FREE(sock->event.fde);
TALLOC_FREE(sock->event.te);
- /* TODO: hand this in via the options? */
- smb2_capabilities = SMB2_CAP_ALL;
-
transport->conn = smbXcli_conn_create(transport,
sock->sock->fd,
sock->hostname,
options->signing,
0, /* smb1_capabilities */
&options->client_guid,
- smb2_capabilities);
+ options->smb2_capabilities);
if (transport->conn == NULL) {
talloc_free(transport);
return NULL;
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 900db7d40a..5f4f4181cc 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -44,6 +44,7 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
options->unicode = lpcfg_unicode(lp_ctx);
options->use_oplocks = true;
options->use_level2_oplocks = true;
+ options->smb2_capabilities = SMB2_CAP_ALL;
options->client_guid = GUID_random();
}