s3-net: Convert the key_name to UTF8 during migration

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11922

Pair-Programmed-With: Guenther Deschner <gd@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Guenther Deschner <gd@samba.org>

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index 6f805ebac5c59d4983fd7c542912c54e05930abd..cc82e51e67c09310ee977fa799e60c682d214e7a 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -264,27 +264,66 @@ static int net_printing_dump(struct net_context *c, int argc,
                }
 
                if (strncmp((const char *)kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) == 0) {
-                       dump_form(ctx, (const char *)kbuf.dptr+strlen(FORMS_PREFIX), dbuf.dptr, dbuf.dsize);
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(FORMS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
+                       dump_form(ctx, key_name, dbuf.dptr, dbuf.dsize);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
 
                if (strncmp((const char *)kbuf.dptr, DRIVERS_PREFIX, strlen(DRIVERS_PREFIX)) == 0) {
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(DRIVERS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
                        dump_driver(ctx,
-                                   (const char *)kbuf.dptr+strlen(DRIVERS_PREFIX),
+                                   key_name,
                                    dbuf.dptr,
                                    dbuf.dsize,
                                    do_string_conversion);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
 
                if (strncmp((const char *)kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
                        dump_printer(ctx,
-                                    (const char *)kbuf.dptr+strlen(PRINTERS_PREFIX),
+                                    key_name,
                                     dbuf.dptr,
                                     dbuf.dsize,
                                     do_string_conversion);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
@@ -357,33 +396,72 @@ static NTSTATUS printing_migrate_internal(struct net_context *c,
                }
 
                if (strncmp((const char *) kbuf.dptr, FORMS_PREFIX, strlen(FORMS_PREFIX)) == 0) {
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(tmp_ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(FORMS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
                        printing_tdb_migrate_form(tmp_ctx,
                                     winreg_pipe,
-                                    (const char *) kbuf.dptr + strlen(FORMS_PREFIX),
+                                    key_name,
                                     dbuf.dptr,
                                     dbuf.dsize);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
 
                if (strncmp((const char *) kbuf.dptr, DRIVERS_PREFIX, strlen(DRIVERS_PREFIX)) == 0) {
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(tmp_ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(DRIVERS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
                        printing_tdb_migrate_driver(tmp_ctx,
                                       winreg_pipe,
-                                      (const char *) kbuf.dptr + strlen(DRIVERS_PREFIX),
+                                      key_name,
                                       dbuf.dptr,
                                       dbuf.dsize,
                                       do_string_conversion);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }
 
                if (strncmp((const char *) kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
+                       char *key_name = NULL;
+                       size_t converted_size = 0;
+                       bool ok;
+
+                       ok = pull_ascii_talloc(tmp_ctx,
+                                              &key_name,
+                                              (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX),
+                                              &converted_size);
+                       if (!ok) {
+                               continue;
+                       }
+
                        printing_tdb_migrate_printer(tmp_ctx,
                                        winreg_pipe,
-                                       (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX),
+                                       key_name,
                                        dbuf.dptr,
                                        dbuf.dsize,
                                        do_string_conversion);
+                       TALLOC_FREE(key_name);
                        SAFE_FREE(dbuf.dptr);
                        continue;
                }