summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-03-13 22:55:05 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-03-13 22:55:05 +0000
commitf5e2f6f5d2c88895dd5faedf4ce21b10920fd88d (patch)
tree68b02e142e71d358dbbe243343d18d41adf125b8
parent113d9a47dc88a3fd17dea0533fbba271d57fefc0 (diff)
downloaddrakx-backup-do-not-use-f5e2f6f5d2c88895dd5faedf4ce21b10920fd88d.tar
drakx-backup-do-not-use-f5e2f6f5d2c88895dd5faedf4ce21b10920fd88d.tar.gz
drakx-backup-do-not-use-f5e2f6f5d2c88895dd5faedf4ce21b10920fd88d.tar.bz2
drakx-backup-do-not-use-f5e2f6f5d2c88895dd5faedf4ce21b10920fd88d.tar.xz
drakx-backup-do-not-use-f5e2f6f5d2c88895dd5faedf4ce21b10920fd88d.zip
Fixed bug #417: '$' character in printer URI not correctly handled.
-rw-r--r--perl-install/printer/main.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index ec63b6567..51f9ad375 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -1740,6 +1740,8 @@ sub configure_queue($) {
#- Create the queue with "foomatic-configure", in case of queue
#- renaming copy the old queue
+ my $quotedconnect = $printer->{currentqueue}{connect};
+ $quotedconnect =~ s/\$/\\\$/g; # Quote '$' in URI
run_program::rooted($::prefix, "foomatic-configure", "-q",
"-s", $printer->{currentqueue}{spooler},
"-n", $printer->{currentqueue}{queue},
@@ -1747,7 +1749,7 @@ sub configure_queue($) {
$printer->{OLD_QUEUE} &&
$printer->{configured}{$printer->{OLD_QUEUE}} ?
("-C", $printer->{OLD_QUEUE}) : ()),
- "-c", $printer->{currentqueue}{connect},
+ "-c", $quotedconnect,
($printer->{currentqueue}{foomatic} ?
("-p", $printer->{currentqueue}{printer},
"-d", $printer->{currentqueue}{driver}) :