From 5a069f7209855e69082a176969533cc0d0ac0f55 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 19 Mar 2010 15:47:11 +0100
Subject: [PATCH] s3:smbd: disable SMB encryption when the echo handler is
 active

metze
---
 source3/smbd/trans2.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 09b1621f3d7..0ee9be32b22 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3585,6 +3585,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"));
 
-- 
2.11.4.GIT