s4:smb_server/smb: FLAGS2_SMB_SECURITY_SIGNATURES should only be echoed, not set...

metze

diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index eb3e100b96c4d3d354381f43e4ad5687a06c2ec4..241c2628572c2fdd1acb9fa8ab41bac92fc302b2 100644 (file)
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -135,15 +135,16 @@ void smbsrv_setup_reply(struct smbsrv_request *req, uint_t wct, size_t buflen)
        flags2 = FLAGS2_LONG_PATH_COMPONENTS | 
                FLAGS2_EXTENDED_ATTRIBUTES | 
                FLAGS2_IS_LONG_NAME;
-       flags2 |= (req->flags2 & (FLAGS2_UNICODE_STRINGS|FLAGS2_EXTENDED_SECURITY));
+#define _SMB_FLAGS2_ECHOED_FLAGS ( \
+       FLAGS2_UNICODE_STRINGS | \
+       FLAGS2_EXTENDED_SECURITY | \
+       FLAGS2_SMB_SECURITY_SIGNATURES \
+)
+       flags2 |= (req->flags2 & _SMB_FLAGS2_ECHOED_FLAGS);
        if (req->smb_conn->negotiate.client_caps & CAP_STATUS32) {
                flags2 |= FLAGS2_32_BIT_ERROR_CODES;
        }
 
-       if (req->smb_conn->signing.allow_smb_signing || req->smb_conn->signing.mandatory_signing) {
-               flags2 |= FLAGS2_SMB_SECURITY_SIGNATURES; 
-       }
-       
        req->out.hdr = req->out.buffer + NBT_HDR_SIZE;
        req->out.vwv = req->out.hdr + HDR_VWV;
        req->out.wct = wct;