From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 17 Aug 2012 07:41:42 +0000 (+0200)
Subject: s3:smbd: make use of ENCRYPTION_REQUIRED()
X-Git-Tag: samba-4.0.0beta7~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b3da9a1f400040eef14b63ed0b7884a9e82d907;p=thirdparty%2Fsamba.git

s3:smbd: make use of ENCRYPTION_REQUIRED()

metze
---

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b30478cb255..2de6e41d113 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -8506,9 +8506,9 @@ static void handle_trans2(connection_struct *conn, struct smb_request *req,
 		SSVAL((discard_const_p(uint8_t, req->inbuf)),smb_flg2,req->flags2);
 	}
 
-	if (conn->encrypt_level == Required && !req->encrypted) {
+	if (ENCRYPTION_REQUIRED(conn) && !req->encrypted) {
 		if (state->call != TRANSACT2_QFSINFO &&
-				state->call != TRANSACT2_SETFSINFO) {
+		    state->call != TRANSACT2_SETFSINFO) {
 			DEBUG(0,("handle_trans2: encryption required "
 				"with call 0x%x\n",
 				(unsigned int)state->call));