holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Handle SELinux getattr denials in open() processing

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2017-09-26 09:34:08 -07:00
parent a7be3dfece
commit 1cb98254cc
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/Perl/Shorewall/Config.pm
View File

@ -42,6 +42,7 @@ use autouse 'Carp' => qw(longmess confess);
use Scalar::Util 'reftype'; use Scalar::Util 'reftype';
use FindBin; use FindBin;
use Digest::SHA qw(sha1_hex); use Digest::SHA qw(sha1_hex);
use Errno qw(:POSIX);
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
# #
@ -754,7 +755,7 @@ sub initialize( $;$$) {
TC_SCRIPT => '', TC_SCRIPT => '',
EXPORT => 0, EXPORT => 0,
KLUDGEFREE => '', KLUDGEFREE => '',
VERSION => "5.1.5-RC1", VERSION => "5.1.8-Beta1",
CAPVERSION => 50106 , CAPVERSION => 50106 ,
BLACKLIST_LOG_TAG => '', BLACKLIST_LOG_TAG => '',
RELATED_LOG_TAG => '', RELATED_LOG_TAG => '',
@ -2569,18 +2570,22 @@ sub open_file( $;$$$$ ) {
assert( ! defined $currentfile ); assert( ! defined $currentfile );
if ( -f $fname && -s _ ) { if ( -f $fname ) {
if ( -s _ ) {
$first_entry = 0; $first_entry = 0;
$file_format = supplied $cf ? $cf : 1; $file_format = supplied $cf ? $cf : 1;
$max_format = supplied $mf ? $mf : 1; $max_format = supplied $mf ? $mf : 1;
$comments_allowed = supplied $ca ? $ca : 0; $comments_allowed = supplied $ca ? $ca : 0;
$nocomment = $nc; $nocomment = $nc;
do_open_file $fname;; return do_open_file $fname;
}
} else { } else {
$!{ENOENT} or fatal_error "Unable to open file $fname: " . $!;
}
$ifstack = @ifstack; $ifstack = @ifstack;
''; '';
} }
}
# #
# Push open-specific globals onto the include stack # Push open-specific globals onto the include stack