summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsamba_wizard/Sambaprint.pm29
1 files changed, 15 insertions, 14 deletions
diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm
index 91107669..de911e2d 100755
--- a/samba_wizard/Sambaprint.pm
+++ b/samba_wizard/Sambaprint.pm
@@ -218,7 +218,7 @@ sub printer_sharing() {
$samba->{printers}{path} = "/var/spool/samba";
$samba->{printers}{writable} = "no";
$samba->{printers}{printable} = "yes";
- $samba->{printers}{'print command'} = "lpr-cups -P %p -o raw %s -r";
+ $samba->{printers}{'print command'} = "lpr-cups -P \%p -o raw \%s -r";
$samba->{printers}{'use client driver'} = "yes";
if ($o->{var}{wiz_box_list}) {
for (my $i; $i < @{$o->{var}{wiz_box_list}}; $i++) {
@@ -234,22 +234,23 @@ sub printer_sharing() {
sub printer_section() {
$samba->{'pdf-gen'};
- $samba->{path} = "/var/tmp";
- $samba->{'guest ok'} = "no";
- $samba->{printable} = "yes";
- $samba->{comment} = "PDF Generator (only valid users)";
- $samba->{printing} = "bsd";
- $samba->{'print command'} = "/usr/share/samba/scripts/print-pdf \"%s\" \"%H\" \"//%L/%u\" \"%m\" \"%I\" \"%J\" &";
- $samba->{'lpq command'} = "/bin/true";
+ $samba->{'pdf-gen'}{path} = "/var/tmp";
+ $samba->{'pdf-gen'}{'guest ok'} = "no";
+ $samba->{'pdf-gen'}{printable} = "yes";
+ $samba->{'pdf-gen'}{comment} = "PDF Generator (only valid users)";
+ $samba->{'pdf-gen'}{printing} = "bsd";
+ $samba->{'pdf-gen'}{'print command'} = "/usr/share/samba/scripts/print-pdf \"%s\" \"%H\" \"//%L/%u\" \"%m\" \"%I\" \"%J\" &";
+ $samba->{'pdf-gen'}{'lpq command'} = "/bin/true";
}
sub printdollar_section() {
$samba->{'print$'};
- $samba->{path} = "/var/lib/samba/printers";
- $samba->{browseable} = "yes";
- $samba->{'write list'} = "\@adm root";
- $samba->{'guest ok'} = "yes";
- $samba->{inherit permissions} = "yes";
+ $samba->{'print$'}{browseable} = "yes";
+ $samba->{'print$'}{path} = "/var/lib/samba/printers";
+ $samba->{'print$'}{browseable} = "yes";
+ $samba->{'print$'}{'write list'} = "\@adm root";
+ $samba->{'print$'}{'guest ok'} = "yes";
+ $samba->{'print$'}{'inherit permissions'} = "yes";
}
sub get_printers() {
@@ -281,7 +282,7 @@ sub do_it {
my $w = $in->wait_message(N("Samba server"), N("Configuring your Samba server..."));
# share printers
- if ($o->{var}{wiz_do_printer_sharing} == 0) {
+ if ($o->{var}{wiz_do_printer_sharing} == 1) {
printer_sharing();
printer_section();
printdollar_section();