wafsamba/samba_autoconf: when setting undefined result, use empty tuple

[samba.git] / source4 / libnet / libnet_samdump.c

diff --git a/source4/libnet/libnet_samdump.c b/source4/libnet/libnet_samdump.c
index 8092260515b97e0da47b35d21ea5a1576b8b0c27..326d8041b26d1b17befcaa261ccfb513aae2d5a3 100644 (file)
--- a/source4/libnet/libnet_samdump.c
+++ b/source4/libnet/libnet_samdump.c
@@ -181,13 +181,14 @@ NTSTATUS libnet_SamDump(struct libnet_context *ctx, TALLOC_CTX *mem_ctx,
        for (t=samdump_state->trusted_domains; t; t=t->next) {
                char *secret_name = talloc_asprintf(mem_ctx, "G$$%s", t->name);
                for (s=samdump_state->secrets; s; s=s->next) {
+                       size_t converted_size = 0;
                        char *secret_string;
                        if (strcasecmp_m(s->name, secret_name) != 0) {
                                continue;
                        }
-                       if (!convert_string_talloc_convenience(mem_ctx, lp_iconv_convenience(ctx->lp_ctx), CH_UTF16, CH_UNIX, 
+                       if (!convert_string_talloc_handle(mem_ctx, lpcfg_iconv_handle(ctx->lp_ctx), CH_UTF16, CH_UNIX,
                                                  s->secret.data, s->secret.length, 
-                                                 (void **)&secret_string, NULL, false)) {
+                                                 (void **)&secret_string, &converted_size)) {
                                r->out.error_string = talloc_asprintf(mem_ctx, 
                                                                      "Could not convert secret for domain %s to a string",
                                                                      t->name);