strip domain, apparmor replace roule

diff --git a/cups-pdf-find-owner.pl b/cups-pdf-find-owner.pl
index 54fafcc..b1754d7 100755 (executable)
--- a/cups-pdf-find-owner.pl
+++ b/cups-pdf-find-owner.pl
@@ -7,6 +7,8 @@ use Data::Dump qw(dump);
 use File::Slurp;
 use DBI;
 
+open(STDERR, '>>', '/var/log/cups/find_owner_log');
+
 my ($file, $local_user, $remote_user) = @ARGV;
 
 my $job_id = $1 if ( $file =~ m/job_(\d+)/ );
@@ -45,12 +47,15 @@ warn "## row = ",dump($row);
 $sth->finish;
 
 my $username = $row->{username} || die "no username in row = ",dump($row);
+$username =~ s/\@ffzg.hr$//; # strip domain, same as pGina
 
 my $spool = '/var/spool/cups-pdf/';
 mkdir "$spool/$username" if ( ! -e "$spool/$username" );
 my $filename_only = $file;
 $filename_only =~ s/^.*\///; # basename
 
-rename $file, "$spool/$username/$filename_only";
+my $to = "$spool/$username/$filename_only";
+rename $file, $to;
+warn "# $to";
 
 exit 0;

diff --git a/doc/cups-pdf.txt b/doc/cups-pdf.txt
index 19dd752..c18d982 100644 (file)
--- a/doc/cups-pdf.txt
+++ b/doc/cups-pdf.txt
@@ -23,3 +23,9 @@ add permission for script execution:
   /srv/safeq/cups-pdf-find-owner.pl uxr,
 }
 
+
+
+apparmor_parser -r /etc/apparmor.d/usr.sbin.cupsd
+
+/etc/init.d/apparmor restart
+