diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-03-24 10:53:06 +1100 |
commit | 0e3339a46b1747156f35d136dbbc93b503b85b1c (patch) | |
tree | 783aafc4b94db5ba1be889cbe4b44363dfee5d54 /source3/smbd/trans2.c | |
parent | 7f113904eba5361d963075bcea7e36fd98ca34aa (diff) | |
parent | 36b957b5b7a1f70e39eeef224820739f24b999c9 (diff) | |
download | samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.gz samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.tar.xz samba-0e3339a46b1747156f35d136dbbc93b503b85b1c.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r-- | source3/smbd/trans2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index ee1dda98b2..df01a39893 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -832,6 +832,7 @@ void send_trans2_replies(connection_struct *conn, show_msg((char *)req->outbuf); if (!srv_send_smb(smbd_server_fd(), (char *)req->outbuf, + true, req->seqnum+1, IS_CONN_ENCRYPTED(conn), &req->pcd)) exit_server_cleanly("send_trans2_replies: srv_send_smb failed."); @@ -2892,8 +2893,8 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned case SMB_QUERY_CIFS_UNIX_INFO: { bool large_write = lp_min_receive_file_size() && - !srv_is_signing_active(); - bool large_read = !srv_is_signing_active(); + !srv_is_signing_active(smbd_server_conn); + bool large_read = !srv_is_signing_active(smbd_server_conn); int encrypt_caps = 0; if (!lp_unix_extensions()) { |