diff options
| author | Volker Lendecke <vl@samba.org> | 2012-02-24 16:16:23 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-02-24 16:34:42 +0100 |
| commit | b07ae1ab7b19d033e19c4b78c375c608f22548b3 (patch) | |
| tree | 3676b400ad3e2f2a8bbde7a5b05bf328372558c0 | |
| parent | 4708b97ce56d40f5956d88289699fc7139b663f1 (diff) | |
| download | samba-b07ae1ab7b19d033e19c4b78c375c608f22548b3.tar.gz samba-b07ae1ab7b19d033e19c4b78c375c608f22548b3.tar.bz2 samba-b07ae1ab7b19d033e19c4b78c375c608f22548b3.zip | |
s3: Simplify smb_splice_chain
first_request won't be true anymore, we always splice fully existing
records in smbd
| -rw-r--r-- | source3/smbd/process.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 72cc3137fb..bdfc10d2bd 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1790,18 +1790,10 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf) size_t old_size, new_size; size_t ofs; size_t chain_padding = 0; - bool first_request; old_size = talloc_get_size(*poutbuf); - /* - * old_size == smb_wct means we're pushing the first request in for - * libsmb/ - */ - - first_request = (old_size == smb_wct); - - if (!first_request && ((old_size % 4) != 0)) { + if ((old_size % 4) != 0) { /* * Align the wct field of subsequent requests to a 4-byte * boundary @@ -1830,9 +1822,7 @@ static bool smb_splice_chain(uint8_t **poutbuf, const uint8_t *andx_buf) } *poutbuf = outbuf; - if (first_request) { - SCVAL(outbuf, smb_com, smb_command); - } else { + { size_t andx_cmd_ofs; if (!find_andx_cmd_ofs(outbuf, &andx_cmd_ofs)) { |