From 5736f134003f426530040e732a6acc1c86b33f5f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 25 Sep 2013 06:57:23 +0200 Subject: [PATCH] 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 Reviewed-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- source4/libcli/raw/libcliraw.h | 1 + source4/libcli/smb2/transport.c | 5 +---- source4/param/loadparm.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index d2ff90d0e48..95e69431c1e 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 380c9cd2d12..b4a6c943dd1 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 900db7d40a7..5f4f4181ccd 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(); } -- 2.34.1