diff options
author | Volker Lendecke <vlendec@samba.org> | 2007-07-05 16:33:37 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:49 -0500 |
commit | fcda5b589633b96415890c569bf23e3e284e0916 (patch) | |
tree | 0bed21f63dd1eaeabff953f157d9f6b556cf335b /source3/include/srvstr.h | |
parent | 5391750ce6db47678a03db4d67a016acff4fc8e2 (diff) | |
download | samba-fcda5b589633b96415890c569bf23e3e284e0916.tar.gz samba-fcda5b589633b96415890c569bf23e3e284e0916.tar.xz samba-fcda5b589633b96415890c569bf23e3e284e0916.zip |
r23726: Explicitly pass down the FLAGS2 field to srvstr_pull_buf. The next
checkin will pull this up to srvstr_get_path. At that point we can get more
independent of the inbuf, the base_ptr in pull_string will only be used
to satisfy UCS2 alignment constraints.
(This used to be commit 836782b07bf133e9b2598c4a089f1c810e4c7754)
Diffstat (limited to 'source3/include/srvstr.h')
-rw-r--r-- | source3/include/srvstr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h index 1029df53aee..99a7407a6a2 100644 --- a/source3/include/srvstr.h +++ b/source3/include/srvstr.h @@ -18,14 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define srvstr_pull(base_ptr, dest, src, dest_len, src_len, flags) \ - pull_string(base_ptr, dest, src, dest_len, src_len, flags) +#define srvstr_pull(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) \ + pull_string(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) /* pull a string from the smb_buf part of a packet. In this case the string can either be null terminated or it can be terminated by the end of the smbbuf area */ -#define srvstr_pull_buf(inbuf, dest, src, dest_len, flags) \ - pull_string(inbuf, dest, src, dest_len, smb_bufrem(inbuf, src), flags) +#define srvstr_pull_buf(inbuf, smb_flags2, dest, src, dest_len, flags) \ + pull_string(inbuf, smb_flags2, dest, src, dest_len, smb_bufrem(inbuf, src), flags) |