diff options
| author | Günther Deschner <gd@samba.org> | 2005-02-24 23:25:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:46 -0500 |
| commit | 4b03bd3b18cc35270a7f92cbe5da3852dc7ba5b3 (patch) | |
| tree | d5a8d851371e3b329e73b061b5bbf99eb1e22233 /source3/utils/net_rpc_printer.c | |
| parent | 038d939c2aeafcf6e0cd174d5509588e6f953f32 (diff) | |
| download | samba-4b03bd3b18cc35270a7f92cbe5da3852dc7ba5b3.tar.gz samba-4b03bd3b18cc35270a7f92cbe5da3852dc7ba5b3.tar.bz2 samba-4b03bd3b18cc35270a7f92cbe5da3852dc7ba5b3.zip | |
r5546: Fix some comments in "net rpc printer migrate settings"
Guenther
(This used to be commit 67552103ee77013d08e06ed651f6ca6b3b76813e)
Diffstat (limited to 'source3/utils/net_rpc_printer.c')
| -rw-r--r-- | source3/utils/net_rpc_printer.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 00b038dd8b..8fc65b3877 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -2205,7 +2205,6 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const char *devicename = NULL, *unc_name = NULL, *url = NULL; fstring longname; - const char *keyname = NULL; uint16 *keylist = NULL, *curkey; ZERO_STRUCT(ctr_enum); @@ -2242,7 +2241,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const sizeof(printername), -1, STR_TERMINATE); rpcstr_pull(sharename, ctr_enum.printers_2[i].sharename.buffer, sizeof(sharename), -1, STR_TERMINATE); - keyname = ""; + /* we can reset NT_STATUS here because we do not get any real NT_STATUS-codes anymore from now on */ nt_status = NT_STATUS_UNSUCCESSFUL; @@ -2305,14 +2304,6 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const /* do not copy security descriptor (we have another command for that) */ ctr_dst.printers_2->secdesc = NULL; - - /* devmode->devicename is possibly broken at the moment for all - strlen(longprinternames) > MAXDEVICENAME (that is 32 chars) - this fires up thousands of safe_strncpy-debug0-messages - on my test-servers - TODO: tell jerry, jra, etc. again. - */ - #if 0 if (asprintf(&devicename, "\\\\%s\\%s", longname, printername) < 0) { nt_status = NT_STATUS_NO_MEMORY; @@ -2333,7 +2324,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const /* please keep in mind that samba parse_spools gives horribly crippled results when used to cli_spoolss_enumprinterdataex - a win2k3-server. + a win2k3-server. (Bugzilla #1851) FIXME: IIRC I've seen it too on a win2k-server */ @@ -2341,7 +2332,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const result = cli_spoolss_enumprinterdata(cli, mem_ctx, &hnd_src, p, 0, 0, &val_needed, &data_needed, NULL); - /* loop for all printerdata */ + /* loop for all printerdata of "PrinterDriverData" */ while (W_ERROR_IS_OK(result)) { REGISTRY_VALUE value; @@ -2355,7 +2346,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const /* display_value */ if (opt_verbose) - display_reg_value(NULL, value); + display_reg_value(SPOOL_PRINTERDATA_KEY, value); /* set_value */ if (!net_spoolss_setprinterdata(cli_dst, mem_ctx, @@ -2374,7 +2365,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(const DOM_SID *domain_sid, const respond to enumprinterkey, win2k does, so continue in case of an error */ - if (!net_spoolss_enumprinterkey(cli, mem_ctx, &hnd_src, keyname, &keylist)) { + if (!net_spoolss_enumprinterkey(cli, mem_ctx, &hnd_src, "", &keylist)) { printf("got no key-data\n"); continue; } |