diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-12-02 03:17:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:58 -0500 |
| commit | fd7fd22e462ef6cf46e3f63e12ffcd684ea20244 (patch) | |
| tree | d6339bbd0d56aa6e14af05e3cdca2e049f2455ee /source4 | |
| parent | 8dfec3305cc1babeb5d822dc806c0f5dede7da46 (diff) | |
| download | samba-fd7fd22e462ef6cf46e3f63e12ffcd684ea20244.tar.gz samba-fd7fd22e462ef6cf46e3f63e12ffcd684ea20244.tar.bz2 samba-fd7fd22e462ef6cf46e3f63e12ffcd684ea20244.zip | |
r12006: don't require callers to fill in pad bytes in SMB2 calls
(This used to be commit 6935765fda99a6efb19f6f72358d4d48fc35ad5e)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/smb2/close.c | 2 | ||||
| -rw-r--r-- | source4/libcli/smb2/ioctl.c | 2 | ||||
| -rw-r--r-- | source4/libcli/smb2/read.c | 2 | ||||
| -rw-r--r-- | source4/libcli/smb2/session.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/smb2/close.c b/source4/libcli/smb2/close.c index c851d60be4..3e559fe893 100644 --- 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 26f2bffbc1..37e07dbae1 100644 --- 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 f598a78cba..8709aa6ce2 100644 --- 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 12285d5536..07970747c4 100644 --- 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); |