Solve some of the conflict between Samba3 and Samba4 push_string

This renames push_string in Samba3 into push_string_base and
push_string_check for the two different use cases.

This should allow push_string to be imported from Samba4, using it's
calling conventions.

1 files changed, 7 insertions, 4 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index cc442422e8..5a168380a7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -391,10 +391,13 @@ bool pull_ucs2_talloc(TALLOC_CTX *ctx, char **dest, const smb_ucs2_t *src,
 		      size_t *converted_size);
 bool pull_ascii_talloc(TALLOC_CTX *ctx, char **dest, const char *src,
 		       size_t *converted_size);
-size_t push_string_fn(const char *function, unsigned int line,
-		      const void *base_ptr, uint16 flags2,
-		      void *dest, const char *src,
-		      size_t dest_len, int flags);
+size_t push_string_check_fn(const char *function, unsigned int line,
+			    void *dest, const char *src,
+			    size_t dest_len, int flags);
+size_t push_string_base(const char *function, unsigned int line,
+			const char *base, uint16 flags2, 
+			void *dest, const char *src,
+			size_t dest_len, int flags);
 size_t pull_string_fn(const char *function,
 			unsigned int line,
 			const void *base_ptr,