charset: fixed a problem with the global use of the iconv_convenience structure

[ira/wip.git] / librpc / ndr / ndr.c

diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 4d763e0eadd9743ab84ab275f22e198c4366ec65..90be787526f293456e1c36ebc36396a1d93b396f 100644 (file)
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -260,7 +260,8 @@ _PUBLIC_ void ndr_print_function_debug(ndr_print_function_t fn, const char *name
         * this all the way down 
         */
 #if _SAMBA_BUILD_ == 4
         * this all the way down 
         */
 #if _SAMBA_BUILD_ == 4

-       ndr->iconv_convenience = smb_iconv_convenience_init(talloc_autofree_context(), "ASCII", "UTF-8", true);
+       ndr->iconv_convenience = smb_iconv_convenience_reinit(talloc_autofree_context(),
+                                                             "ASCII", "UTF-8", true, NULL);

 #endif
 
        fn(ndr, name, flags, ptr);
 #endif
 
        fn(ndr, name, flags, ptr);


@@ -289,7 +290,8 @@ _PUBLIC_ char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, c
         * this all the way down 
         */
 #if _SAMBA_BUILD_ == 4
         * this all the way down 
         */
 #if _SAMBA_BUILD_ == 4

-       ndr->iconv_convenience = smb_iconv_convenience_init(talloc_autofree_context(), "ASCII", "UTF-8", true);
+       ndr->iconv_convenience = smb_iconv_convenience_reinit(talloc_autofree_context(),
+                                                             "ASCII", "UTF-8", true, NULL);

 #endif
 
        fn(ndr, name, ptr);
 #endif
 
        fn(ndr, name, ptr);