git.samba.org
/
obnox
/
samba-ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a44f882
)
s3:smbd: disable SMB encryption when the echo handler is active
author
Stefan Metzmacher
<metze@samba.org>
Fri, 19 Mar 2010 14:47:11 +0000
(15:47 +0100)
committer
Michael Adam
<obnox@samba.org>
Fri, 26 Mar 2010 11:43:06 +0000
(12:43 +0100)
metze
(cherry picked from commit
5a069f7209855e69082a176969533cc0d0ac0f55
)
source3/smbd/trans2.c
patch
|
blob
|
history
diff --git
a/source3/smbd/trans2.c
b/source3/smbd/trans2.c
index 2c3af0639f860ea83064bd847eb24de2c30124d7..30b849340e32733d266abb2a11262411834af08f 100644
(file)
--- a/
source3/smbd/trans2.c
+++ b/
source3/smbd/trans2.c
@@
-3254,6
+3254,16
@@
cap_low = 0x%x, cap_high = 0x%x\n",
return;
}
+ if (smbd_server_conn->smb1.echo_handler.trusted_fde) {
+ DEBUG( 2,("call_trans2setfsinfo: "
+ "request transport encryption disabled"
+ "with 'fork echo handler = yes'\n"));
+ reply_nterror(
+ req,
+ NT_STATUS_NOT_SUPPORTED);
+ return;
+ }
+
DEBUG( 4,("call_trans2setfsinfo: "
"request transport encryption.\n"));