diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-05 13:45:59 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-05 14:53:54 +0200 |
| commit | 61fb8a4fd1a8b30fffdf941a9ff843825bf966e3 (patch) | |
| tree | 50075c59f5f8baf5ced5d4dc45ba17d08293fe8f /source3/include | |
| parent | 1cbe8b85ae155896e8a4ef39f4b129b2f1e6b1d8 (diff) | |
| download | samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.tar.gz samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.tar.bz2 samba-61fb8a4fd1a8b30fffdf941a9ff843825bf966e3.zip | |
s3: Explicitly pass flags2 to clistr_pull_talloc
Required to eventually make cli_list async
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 3 | ||||
| -rw-r--r-- | source3/include/safe_string.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index dbc2d40c70..2ab1cfdf45 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2646,7 +2646,8 @@ size_t clistr_pull_fn(const char *function, size_t clistr_pull_talloc_fn(const char *function, unsigned int line, TALLOC_CTX *ctx, - const char *inbuf, + const char *base, + uint16_t flags2, char **pp_dest, const void *src, int src_len, diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index 43e43416d8..4ed7ff2859 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -146,9 +146,9 @@ size_t __unsafe_string_function_usage_here_char__(void); clistr_pull_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ inbuf, dest, src, dest_len, src_len, flags) -#define clistr_pull_talloc(ctx, inbuf, pp_dest, src, src_len, flags) \ +#define clistr_pull_talloc(ctx, base, flags2, pp_dest, src, src_len, flags) \ clistr_pull_talloc_fn(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ - ctx, inbuf, pp_dest, src, src_len, flags) + ctx, base, flags2, pp_dest, src, src_len, flags) #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \ srvstr_push_fn2(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, \ |