summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-08-16 10:44:34 -0700
committerMichael Adam <obnox@samba.org>2013-08-21 17:28:55 +0200
commit81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b (patch)
tree92cf22aef86c259427ee41eaa4e8c216277226c5 /source3
parent25521c90859de0651216c459273b2ffd916ee299 (diff)
downloadsamba-81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b.tar.gz
samba-81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b.tar.bz2
samba-81e1058e20bcfc1efab2b39dd7642d8dbbe0cb3b.zip
As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/clidfs.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 1d92843f48..57126e6233 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -48,7 +48,23 @@ NTSTATUS cli_cm_force_encryption(struct cli_state *c,
const char *domain,
const char *sharename)
{
- NTSTATUS status = cli_force_encryption(c,
+ NTSTATUS status;
+
+ if (smbXcli_conn_protocol(c->conn) >= PROTOCOL_SMB2_02) {
+ status = smb2cli_session_encryption_on(c->smb2.session);
+ if (NT_STATUS_EQUAL(status,NT_STATUS_NOT_SUPPORTED)) {
+ d_printf("Encryption required and "
+ "server doesn't support "
+ "SMB3 encryption - failing connect\n");
+ } else if (!NT_STATUS_IS_OK(status)) {
+ d_printf("Encryption required and "
+ "setup failed with error %s.\n",
+ nt_errstr(status));
+ }
+ return status;
+ }
+
+ status = cli_force_encryption(c,
username,
password,
domain);