summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-06-12 15:37:48 +1000
committerAndrew Tridgell <tridge@samba.org>2009-06-12 15:37:48 +1000
commitff4acca13aa53865182bd26715c92e45f6e8f861 (patch)
tree96e13917e2fbb24fbb192c3d828eca0a24b6f4ce
parentddce3b5ac8a5d308c276f05750ee111b8e429e46 (diff)
downloadsamba-ff4acca13aa53865182bd26715c92e45f6e8f861.tar.gz
samba-ff4acca13aa53865182bd26715c92e45f6e8f861.tar.bz2
samba-ff4acca13aa53865182bd26715c92e45f6e8f861.zip
Revert "avoid crashes in ndr_print_*() calls"
This reverts commit f5a47dc4bf2793ab328c8b0e35adace497819e7d. This change broke Samba3. We'll need to do it the long way.
-rw-r--r--librpc/ndr/ndr.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index f253bcb7aa..8188ec998f 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -218,7 +218,6 @@ _PUBLIC_ void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr)
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
ndr->flags = 0;
- ndr->iconv_convenience = global_iconv_convenience;
fn(ndr, name, ptr);
talloc_free(ndr);
}
@@ -237,7 +236,6 @@ _PUBLIC_ void ndr_print_union_debug(ndr_print_fn_t fn, const char *name, uint32_
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
ndr->flags = 0;
- ndr->iconv_convenience = global_iconv_convenience;
ndr_print_set_switch_value(ndr, ptr, level);
fn(ndr, name, ptr);
talloc_free(ndr);
@@ -257,7 +255,6 @@ _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;
- ndr->iconv_convenience = global_iconv_convenience;
fn(ndr, name, flags, ptr);
talloc_free(ndr);
}
@@ -279,7 +276,6 @@ _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;
- ndr->iconv_convenience = global_iconv_convenience;
fn(ndr, name, ptr);
ret = talloc_steal(mem_ctx, (char *)ndr->private_data);
failed:
@@ -304,7 +300,6 @@ _PUBLIC_ char *ndr_print_union_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, co
ndr->print = ndr_print_string_helper;
ndr->depth = 1;
ndr->flags = 0;
- ndr->iconv_convenience = global_iconv_convenience;
ndr_print_set_switch_value(ndr, ptr, level);
fn(ndr, name, ptr);
ret = talloc_steal(mem_ctx, (char *)ndr->private_data);