diff options
| -rw-r--r-- | perl-install/printer/data.pm | 2 | ||||
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm index 3e21e4478..3a105496a 100644 --- a/perl-install/printer/data.pm +++ b/perl-install/printer/data.pm @@ -99,4 +99,4 @@ our %spoolers = ('pdq' => { ); our %spooler_inv = map { $spoolers{$_}{long_name} => $_ } keys %spoolers; -our %shortspooler_inv = map { $spoolers{$_}{short_name} => $spoolers{$_} } keys %spoolers; +our %shortspooler_inv = map { $spoolers{$_}{short_name} => $_ } keys %spoolers; diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 9f93ba9cd..913b417f7 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -3033,8 +3033,8 @@ sub copy_queues_from { N("Reading printer data...")); @oldqueues = printer::main::get_copiable_queues($oldspooler, $newspooler); @oldqueues = sort(@oldqueues); - $newspoolerstr = $printer::data::shortspooler_inv{$newspooler}; - $oldspoolerstr = $printer::data::shortspooler_inv{$oldspooler}; + $newspoolerstr = $printer::data::spoolers{$newspooler}{short_name}; + $oldspoolerstr = $printer::data::spoolers{$oldspooler}{short_name}; foreach (@oldqueues) { push @queuesselected, 1; push @queueentries, { text => $_, type => 'bool', @@ -3269,7 +3269,7 @@ sub security_check { This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessable by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level. Do you really want to configure printing on this machine?", - $printer::data::shortspooler_inv{$spooler}, + $printer::data::spoolers{$spooler}{short_name}, $securitystr))) { printer::main::add_spooler_to_security_level($spooler, $security); my $service; @@ -3304,7 +3304,7 @@ sub start_spooler_on_boot { It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks. Do you want to have the automatic starting of the printing system turned on again?", - $printer::data::shortspooler_inv{$printer->{SPOOLER}}))) { + $printer::data::spoolers{$printer->{SPOOLER}}{short_name}))) { services::start_service_on_boot($service); } } |