From edfaf05f8b25a644359ff4e2c8fa8ba88ec853a9 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Wed, 10 Sep 2014 14:49:08 +0200 Subject: [PATCH] MT#8969 fix file permissions Fixing regression from commit 2c31646: mode "0644" sets mode to --w----r-T as perdoc -f chmod explains. See PBP pages 58-59 for details. --- cdr-exporter.pl | 5 +++-- event-exporter.pl | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cdr-exporter.pl b/cdr-exporter.pl index 5b30d7d..1453135 100755 --- a/cdr-exporter.pl +++ b/cdr-exporter.pl @@ -273,7 +273,8 @@ my @CDR_RESELLER_BODY_FIELDS = qw( if (! -d $dd) { mkdir($dd) or die("failed to create target directory $dd ($!), stop"); chownmod($dd, $config->{'default.FILES_OWNER'}, - $config->{'default.FILES_GROUP'}, '0777', $config->{'default.FILES_MASK'}); + $config->{'default.FILES_GROUP'}, + oct(777), $config->{'default.FILES_MASK'}); } } my $fn = sprintf('%s/%s_%s_%s_%010i.cdr', $dircomp, @@ -303,7 +304,7 @@ my @CDR_RESELLER_BODY_FIELDS = qw( print("### successfully moved $tfn to $fn\n"); chownmod($fn, $config->{'default.FILES_OWNER'}, $config->{'default.FILES_GROUP'}, - '0666', $config->{'default.FILES_MASK'}); + oct(666), $config->{'default.FILES_MASK'}); } # update exported cdrs diff --git a/event-exporter.pl b/event-exporter.pl index 4ec2343..aa1669f 100755 --- a/event-exporter.pl +++ b/event-exporter.pl @@ -224,7 +224,7 @@ foreach my $file(readdir($fh)) { DEBUG "### moving $src to $dst\n"; copy($src, $dst); NGCP::CDR::Export::chownmod($dst, $config->{'default.FILES_OWNER'}, - $config->{'default.FILES_GROUP'}, '0666', + $config->{'default.FILES_GROUP'}, oct(666), $config->{'default.FILES_MASK'}); if($config->{'default.TRANSFER_TYPE'} eq "sftp") { NGCP::CDR::Transfer::sftp(