From 4786a493f70070dce6de4cbe488c9de1bdbb75ad Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 17 Mar 2009 14:04:43 +1100 Subject: 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. --- source3/smbd/srvstr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/smbd/srvstr.c') diff --git a/source3/smbd/srvstr.c b/source3/smbd/srvstr.c index 62b0fe1617..d3f341138c 100644 --- a/source3/smbd/srvstr.c +++ b/source3/smbd/srvstr.c @@ -32,8 +32,8 @@ size_t srvstr_push_fn(const char *function, unsigned int line, } /* 'normal' push into size-specified buffer */ - return push_string_fn(function, line, base_ptr, smb_flags2, dest, src, - dest_len, flags); + return push_string_base(function, line, base_ptr, smb_flags2, dest, src, + dest_len, flags); } /******************************************************************* -- cgit