diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-09-30 08:41:16 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-09-30 08:42:47 +0200 |
| commit | e622325155a13fd9f6f85a767d345344f18eca41 (patch) | |
| tree | 2b0486e5847d72f01fafe72a69bf4dbcff18e564 /source4/smb_server | |
| parent | 04edf11bee9f248241c46ce809870163a16d3ba0 (diff) | |
| download | samba-e622325155a13fd9f6f85a767d345344f18eca41.tar.gz samba-e622325155a13fd9f6f85a767d345344f18eca41.tar.bz2 samba-e622325155a13fd9f6f85a767d345344f18eca41.zip | |
s4:smb_server/smb: FLAGS2_SMB_SECURITY_SIGNATURES should only be echoed, not set always
metze
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb/request.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c index eb3e100b96..241c262857 100644 --- 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; |