From 642a84c12927176726c24f5d709a3479c36bd7e3 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 3 Sep 2009 12:50:19 +1000
Subject: [PATCH] fix the ndr print routines for samba4

This uses a hackish #if just for samba4. The proper fix is much more
complex.
---
 librpc/ndr/ndr.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 7d4a2bc09c9..837690b484f 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -255,7 +255,14 @@ _PUBLIC_ void ndr_print_function_debug(ndr_print_function_t fn, const char *name
 	ndr->print = ndr_print_debug_helper;
 	ndr->depth = 1;
 	ndr->flags = 0;
+
+	/* this is a s4 hack until we build up the courage to pass
+	 * this all the way down 
+	 */
+#if _SAMBA_BUILD_ == 4
 	ndr->iconv_convenience = smb_iconv_convenience_init(talloc_autofree_context(), "ASCII", "UTF-8", true);
+#endif
+
 	fn(ndr, name, flags, ptr);
 	talloc_free(ndr);
 }
@@ -277,6 +284,14 @@ _PUBLIC_ char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, c
 	ndr->print = ndr_print_string_helper;
 	ndr->depth = 1;
 	ndr->flags = 0;
+
+	/* this is a s4 hack until we build up the courage to pass
+	 * this all the way down 
+	 */
+#if _SAMBA_BUILD_ == 4
+	ndr->iconv_convenience = smb_iconv_convenience_init(talloc_autofree_context(), "ASCII", "UTF-8", true);
+#endif
+
 	fn(ndr, name, ptr);
 	ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
 failed:
-- 
2.11.4.GIT