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/include/safe_string.h | |
| parent | d2900ddf1121f777ec8b28620fa93637b58e2a59 (diff) | |
| download | samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.gz samba-6c6fed5e656d64df9c9c12d7909f2c2289208bf7.tar.bz2 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/include/safe_string.h')
| -rw-r--r-- | source3/include/safe_string.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index 8c4d90c44a..c0b9c411ec 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -167,7 +167,7 @@ size_t __unsafe_string_function_usage_here_char__(void); #define pull_string_talloc(ctx, base_ptr, smb_flags2, dest, src, src_len, flags) pull_string_talloc_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, ctx, base_ptr, smb_flags2, dest, src, src_len, flags) #define clistr_push(cli, dest, src, dest_len, flags) clistr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, cli, dest, src, dest_len, flags) #define clistr_pull(cli, dest, src, dest_len, src_len, flags) clistr_pull_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, cli, dest, src, dest_len, src_len, flags) -#define srvstr_push(base_ptr, dest, src, dest_len, flags) srvstr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, base_ptr, dest, src, dest_len, flags) +#define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) srvstr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, base_ptr, smb_flags2, dest, src, dest_len, flags) #define alpha_strcpy(dest,src,other_safe_chars,maxlength) alpha_strcpy_fn(SAFE_STRING_FUNCTION_NAME,SAFE_STRING_LINE,dest,src,other_safe_chars,maxlength) #define StrnCpy(dest,src,n) StrnCpy_fn(SAFE_STRING_FUNCTION_NAME,SAFE_STRING_LINE,dest,src,n) @@ -211,10 +211,10 @@ size_t __unsafe_string_function_usage_here_char__(void); ? __unsafe_string_function_usage_here_size_t__() \ : clistr_pull_fn(fn_name, fn_line, cli, dest, src, dest_len, srclen, flags)) -#define srvstr_push_fn2(fn_name, fn_line, base_ptr, dest, src, dest_len, flags) \ +#define srvstr_push_fn2(fn_name, fn_line, base_ptr, smb_flags2, dest, src, dest_len, flags) \ (CHECK_STRING_SIZE(dest, dest_len) \ ? __unsafe_string_function_usage_here_size_t__() \ - : srvstr_push_fn(fn_name, fn_line, base_ptr, dest, src, dest_len, flags)) + : srvstr_push_fn(fn_name, fn_line, base_ptr, smb_flags2, dest, src, dest_len, flags)) #else |