diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-09 16:47:45 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-04-09 18:33:45 +0200 |
| commit | 63b111bd329fddaf0bfd64ca8255deecb1fd5352 (patch) | |
| tree | 0a8973f5cd6e5169351d93c910a30c1edfa444e7 /source3/utils | |
| parent | bfeab64ebf9481d98ffb182adb03bbd6e6ada462 (diff) | |
| download | samba-63b111bd329fddaf0bfd64ca8255deecb1fd5352.tar.gz samba-63b111bd329fddaf0bfd64ca8255deecb1fd5352.tar.bz2 samba-63b111bd329fddaf0bfd64ca8255deecb1fd5352.zip | |
s3: add iconv_convenience handle to pull/push sz helpers.
Guenther
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 14 | ||||
| -rw-r--r-- | source3/utils/net_rpc_registry.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 6c11a2feb2..9d38fca77e 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -84,7 +84,7 @@ static void display_reg_value(const char *subkey, struct regval_blob value) case REG_SZ: blob = data_blob_const(value.data_p, value.size); - pull_reg_sz(talloc_tos(), &blob, &text); + pull_reg_sz(talloc_tos(), NULL, &blob, &text); if (!text) { break; } @@ -103,7 +103,7 @@ static void display_reg_value(const char *subkey, struct regval_blob value) const char **values; blob = data_blob_const(value.data_p, value.size); - if (!pull_reg_multi_sz(NULL, &blob, &values)) { + if (!pull_reg_multi_sz(NULL, NULL, &blob, &values)) { d_printf("pull_reg_multi_sz failed\n"); break; } @@ -2422,7 +2422,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, if (strequal(info[j].value_name, SPOOL_REG_PORTNAME)) { /* although windows uses a multi-sz, we use a sz */ - push_reg_sz(mem_ctx, &blob, SAMBA_PRINTER_PORT_NAME); + push_reg_sz(mem_ctx, NULL, &blob, SAMBA_PRINTER_PORT_NAME); fstrcpy(value.valuename, SPOOL_REG_PORTNAME); } @@ -2432,7 +2432,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, nt_status = NT_STATUS_NO_MEMORY; goto done; } - push_reg_sz(mem_ctx, &blob, unc_name); + push_reg_sz(mem_ctx, NULL, &blob, unc_name); fstrcpy(value.valuename, SPOOL_REG_UNCNAME); } @@ -2446,20 +2446,20 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, nt_status = NT_STATUS_NO_MEMORY; goto done; } - push_reg_sz(mem_ctx, &blob, url); + push_reg_sz(mem_ctx, NULL, &blob, url); fstrcpy(value.valuename, SPOOL_REG_URL); #endif } if (strequal(info[j].value_name, SPOOL_REG_SERVERNAME)) { - push_reg_sz(mem_ctx, &blob, longname); + push_reg_sz(mem_ctx, NULL, &blob, longname); fstrcpy(value.valuename, SPOOL_REG_SERVERNAME); } if (strequal(info[j].value_name, SPOOL_REG_SHORTSERVERNAME)) { - push_reg_sz(mem_ctx, &blob, global_myname()); + push_reg_sz(mem_ctx, NULL, &blob, global_myname()); fstrcpy(value.valuename, SPOOL_REG_SHORTSERVERNAME); } diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index fb9d80b876..28a1c8d82f 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -961,7 +961,7 @@ static void dump_values( REGF_NK_REC *nk ) switch ( nk->values[i].type ) { case REG_SZ: blob = data_blob_const(nk->values[i].data, data_size); - pull_reg_sz(talloc_tos(), &blob, &data_str); + pull_reg_sz(talloc_tos(), NULL, &blob, &data_str); if (!data_str) { break; } |