diff options
| -rw-r--r-- | lib/util/string_wrappers.h | 6 | ||||
| -rw-r--r-- | source3/libsmb/clistr.c | 26 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 5 |
3 files changed, 0 insertions, 37 deletions
diff --git a/lib/util/string_wrappers.h b/lib/util/string_wrappers.h index 31dc9140eb..c39ff1f859 100644 --- a/lib/util/string_wrappers.h +++ b/lib/util/string_wrappers.h @@ -73,11 +73,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void); ? __unsafe_string_function_usage_here_size_t__() \ : push_string_check_fn(dest, src, dest_len, flags)) -#define clistr_push(cli, dest, src, dest_len, flags) \ - (CHECK_STRING_SIZE(dest, dest_len) \ - ? __unsafe_string_function_usage_here_size_t__() \ - : clistr_push_fn(cli, dest, src, dest_len, flags)) - #define srvstr_push(base_ptr, smb_flags2, dest, src, dest_len, flags) \ (CHECK_STRING_SIZE(dest, dest_len) \ ? __unsafe_string_function_usage_here_size_t__() \ @@ -97,7 +92,6 @@ size_t __unsafe_string_function_usage_here_size_t__(void); #else #define push_string_check push_string_check_fn -#define clistr_push clistr_push_fn #define srvstr_push srvstr_push_fn #define checked_strlcpy strlcpy diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c index e66b546eab..f1264f65ce 100644 --- a/source3/libsmb/clistr.c +++ b/source3/libsmb/clistr.c @@ -21,32 +21,6 @@ #include "includes.h" #include "libsmb/libsmb.h" -size_t clistr_push_fn(struct cli_state *cli, - void *dest, - const char *src, - int dest_len, - int flags) -{ - size_t buf_used = PTR_DIFF(dest, cli->outbuf); - if (dest_len == -1) { - if (((ptrdiff_t)dest < (ptrdiff_t)cli->outbuf) || (buf_used > cli->bufsize)) { - DEBUG(0, ("Pushing string of 'unlimited' length into non-SMB buffer!\n")); - return push_string_base(cli->outbuf, - (uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0), - dest, src, -1, flags); - } - return push_string_base(cli->outbuf, - (uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0), - dest, src, cli->bufsize - buf_used, - flags); - } - - /* 'normal' push into size-specified buffer */ - return push_string_base(cli->outbuf, - (uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0), - dest, src, dest_len, flags); -} - size_t clistr_pull_talloc(TALLOC_CTX *ctx, const char *base, uint16_t flags2, diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index f364621938..2883af2fad 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -780,11 +780,6 @@ NTSTATUS cli_set_secdesc(struct cli_state *cli, uint16_t fnum, /* The following definitions come from libsmb/clistr.c */ -size_t clistr_push_fn(struct cli_state *cli, - void *dest, - const char *src, - int dest_len, - int flags); size_t clistr_pull_talloc(TALLOC_CTX *ctx, const char *base, uint16_t flags2, |