Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into nosmbpython

[ab/samba.git/.git] / source4 / libcli / smb2 / flush.c

diff --git a/source4/libcli/smb2/flush.c b/source4/libcli/smb2/flush.c
index d9178aeb9f83514a41f26a8780e7ff22c77b5d86..577d1ba1ba78845af00efd52ac78d132320bad4e 100644 (file)
--- a/source4/libcli/smb2/flush.c
+++ b/source4/libcli/smb2/flush.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -31,12 +30,12 @@ struct smb2_request *smb2_flush_send(struct smb2_tree *tree, struct smb2_flush *
 {
        struct smb2_request *req;
 
-       req = smb2_request_init_tree(tree, SMB2_OP_FLUSH, 0x18, 0);
+       req = smb2_request_init_tree(tree, SMB2_OP_FLUSH, 0x18, false, 0);
        if (req == NULL) return NULL;
 
-       SSVAL(req->out.body, 0x02, 0); /* pad? */
-       SIVAL(req->out.body, 0x04, io->in.unknown);
-       smb2_push_handle(req->out.body+0x08, &io->in.handle);
+       SSVAL(req->out.body, 0x02, io->in.reserved1);
+       SIVAL(req->out.body, 0x04, io->in.reserved2);
+       smb2_push_handle(req->out.body+0x08, &io->in.file.handle);
 
        smb2_transport_send(req);
 
@@ -50,11 +49,13 @@ struct smb2_request *smb2_flush_send(struct smb2_tree *tree, struct smb2_flush *
 NTSTATUS smb2_flush_recv(struct smb2_request *req, struct smb2_flush *io)
 {
        if (!smb2_request_receive(req) || 
-           smb2_request_is_error(req)) {
+           !smb2_request_is_ok(req)) {
                return smb2_request_destroy(req);
        }
 
-       SMB2_CHECK_PACKET_RECV(req, 0x04, False);
+       SMB2_CHECK_PACKET_RECV(req, 0x04, false);
+
+       io->out.reserved = SVAL(req->in.body, 0x02);
 
        return smb2_request_destroy(req);
 }