1 files changed, 14 insertions, 68 deletions
diff --git a/source3/libsmb/clistr.c b/source3/libsmb/clistr.c
index 6e45799c36..f1264f65ce 100644
--- a/source3/libsmb/clistr.c
+++ b/source3/libsmb/clistr.c
@@ -21,73 +21,19 @@
 #include "includes.h"
 #include "libsmb/libsmb.h"
 
-size_t clistr_push_fn(const char *function,
-			unsigned int line,
-			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,
+			  char **pp_dest,
+			  const void *src,
+			  int src_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(function, line,
-						cli->outbuf,
-						(uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0),
-						dest, src, -1, flags);
-		}
-		return push_string_base(function, line, 
-					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(function, line, 
-				cli->outbuf,
-				(uint16_t)(cli_ucs2(cli) ? FLAGS2_UNICODE_STRINGS : 0),
-				dest, src, dest_len, flags);
-}
-
-size_t clistr_pull_fn(const char *function,
-			unsigned int line,
-			const char *inbuf,
-			char *dest,
-			const void *src,
-			int dest_len,
-			int src_len,
-			int flags)
-{
-	return pull_string_fn(function, line, inbuf,
-			      SVAL(inbuf, smb_flg2), dest, src, dest_len,
-			      src_len, flags);
-}
-
-size_t clistr_pull_talloc_fn(const char *function,
-				unsigned int line,
-				TALLOC_CTX *ctx,
-				const char *base,
-				uint16_t flags2,
-				char **pp_dest,
-				const void *src,
-				int src_len,
-				int flags)
-{
-	return pull_string_talloc_fn(function,
-					line,
-					ctx,
-					base,
-					flags2,
-					pp_dest,
-					src,
-					src_len,
-					flags);
-}
-
-size_t clistr_align_out(struct cli_state *cli, const void *p, int flags)
-{
-	return align_string(cli->outbuf, (const char *)p, flags);
+	return pull_string_talloc(ctx,
+				  base,
+				  flags2,
+				  pp_dest,
+				  src,
+				  src_len,
+				  flags);
 }