diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-08-02 17:37:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:09 -0500 |
| commit | 6c6fed5e656d64df9c9c12d7909f2c2289208bf7 (patch) | |
| tree | e3a6407fa256f6d94265afe91ac173f6220b298b /source3/smbd/srvstr.c | |
| parent | d2900ddf1121f777ec8b28620fa93637b58e2a59 (diff) | |
| download | samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.gz samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.xz samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.zip | |
r24130: Explicitly pass flags2 to srvstr_push
This is in preparation of the trans2 conversion: srvstr_push should not
look at inbuf directly.
(This used to be commit 5fd7e6a3821bea26d352e3edc23b7a216b1200e5)
Diffstat (limited to 'source3/smbd/srvstr.c')
| -rw-r--r-- | source3/smbd/srvstr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c index 1daa25553f..df993537ba 100644 --- a/source3/smbd/srvstr.c +++ b/source3/smbd/srvstr.c @@ -24,7 +24,7 @@ extern int max_send; /* Make sure we can't write a string past the end of the buffer */ size_t srvstr_push_fn(const char *function, unsigned int line, - const char *base_ptr, void *dest, + const char *base_ptr, uint16 smb_flags2, void *dest, const char *src, int dest_len, int flags) { size_t buf_used = PTR_DIFF(dest, base_ptr); @@ -68,8 +68,8 @@ ssize_t message_push_string(uint8 **outbuf, const char *str, int flags) return -1; } - result = srvstr_push((char *)tmp, tmp + buf_size, str, grow_size, - flags); + result = srvstr_push((char *)tmp, SVAL(tmp, smb_flg2), + tmp + buf_size, str, grow_size, flags); if (result == (size_t)-1) { DEBUG(0, ("srvstr_push failed\n")); |