r12006: don't require callers to fill in pad bytes in SMB2 calls

(This used to be commit 6935765fda99a6efb19f6f72358d4d48fc35ad5e)

diff --git a/source4/libcli/smb2/close.c b/source4/libcli/smb2/close.c
index c851d60be4ae3ec3c8a131a21042aa064c1d6738..3e559fe89318f580ec89249fb51a929fe2f5ba21 100644 (file)
--- a/source4/libcli/smb2/close.c
+++ b/source4/libcli/smb2/close.c
@@ -36,7 +36,7 @@ struct smb2_request *smb2_close_send(struct smb2_tree *tree, struct smb2_close *
        if (req == NULL) return NULL;
 
        SSVAL(req->out.body, 0x02, io->in.flags);
-       SIVAL(req->out.body, 0x04, io->in._pad);
+       SIVAL(req->out.body, 0x04, 0); /* pad */
        smb2_push_handle(req->out.body+0x08, &io->in.handle);
 
        smb2_transport_send(req);

diff --git a/source4/libcli/smb2/ioctl.c b/source4/libcli/smb2/ioctl.c
index 26f2bffbc1f6cd7374b24aa40cc2aa760443d994..37e07dbae1900b8940b3cf9691893b905a0f016d 100644 (file)
--- a/source4/libcli/smb2/ioctl.c
+++ b/source4/libcli/smb2/ioctl.c
@@ -37,7 +37,7 @@ struct smb2_request *smb2_ioctl_send(struct smb2_tree *tree, struct smb2_ioctl *
                                     io->in.in.length+io->in.out.length);
        if (req == NULL) return NULL;
 
-       SSVAL(req->out.body, 0x02, io->in._pad);
+       SSVAL(req->out.body, 0x02, 0); /* pad */
        SIVAL(req->out.body, 0x04, io->in.function);
        smb2_push_handle(req->out.body+0x08, &io->in.handle);
 

diff --git a/source4/libcli/smb2/read.c b/source4/libcli/smb2/read.c
index f598a78cbaaf53b1f38f424253da4456b6100da8..8709aa6ce2213563f4a3908ef592ae867e7d2967 100644 (file)
--- a/source4/libcli/smb2/read.c
+++ b/source4/libcli/smb2/read.c
@@ -35,7 +35,7 @@ struct smb2_request *smb2_read_send(struct smb2_tree *tree, struct smb2_read *io
        req = smb2_request_init_tree(tree, SMB2_OP_READ, 0x31, 0);
        if (req == NULL) return NULL;
 
-       SSVAL(req->out.body, 0x02, io->in._pad);
+       SSVAL(req->out.body, 0x02, 0); /* pad */
        SIVAL(req->out.body, 0x04, io->in.length);
        SBVAL(req->out.body, 0x08, io->in.offset);
        smb2_push_handle(req->out.body+0x10, &io->in.handle);

diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index 12285d55369ccb8146f77f77a43793a380e732e0..07970747c498100d925a7bad3da8254920499acc 100644 (file)
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -73,7 +73,7 @@ struct smb2_request *smb2_session_setup_send(struct smb2_session *session,
        if (req == NULL) return NULL;
 
        SBVAL(req->out.hdr,  SMB2_HDR_UID, session->uid);
-       SSVAL(req->out.body, 0x02, io->in._pad);
+       SSVAL(req->out.body, 0x02, 0); /* pad */
        SIVAL(req->out.body, 0x04, io->in.unknown2);
        SIVAL(req->out.body, 0x08, io->in.unknown3);