mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-30 22:05:27 +00:00
Code Issues Releases Wiki Activity

keep change_hat rules

Browse Source
This commit is contained in:
John Johansen
2008-04-18 20:57:51 +00:00
parent d07689e2a7
commit 2a0dc5aae9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/SubDomain.pm
View File

@@ -4354,7 +4354,17 @@ sub parse_profile_data {
# keep track of netdomain entries... # keep track of netdomain entries...
push @{$profile_data->{$profile}{$hat}{netdomain}}, $_; push @{$profile_data->{$profile}{$hat}{netdomain}}, $_;
} elsif (m/^\s*\^(\"?.+?)\s+(flags=\(.+\)\s+)*\{\s*(#.*)?$/) { } elsif (m/^\s*\^(\"??.+?\"??)\s*,\s*(#.*)?$/) {
# change_hat declaration - needed to change_hat to an external
# hat
$hat = $1;
$hat = $1 if $hat =~ /^"(.+)"$/;
#store we have a declaration if the hat hasn't been seen
$profile_data->{$profile}{$hat}{'declared'} = 1
unless exists($profile_data->{$profile}{$hat}{declared});
} elsif (m/^\s*\^(\"??.+?\"??)\s+(flags=\(.+\)\s+)*\{\s*(#.*)?$/) {
# start of a deprecated syntax hat definition # start of a deprecated syntax hat definition
# read in and mark as changed so that will be written out in the new # read in and mark as changed so that will be written out in the new
# format # format
@@ -4369,17 +4379,16 @@ sub parse_profile_data {
# we hit the start of a hat inside the current profile # we hit the start of a hat inside the current profile
$hat = $1; $hat = $1;
my $flags = $2; my $flags = $3;
# deal with whitespace in hat names. # strip quotes.
$hat = $1 if $hat =~ /^"(.+)"$/; $hat = $1 if $hat =~ /^"(.+)"$/;
# keep track of profile flags # keep track of profile flags
if ($flags && $flags =~ /^flags=\((.+)\)\s*$/) { $profile_data->{$profile}{$hat}{flags} = $flags;
$flags = $1;
$profile_data->{$profile}{$hat}{flags} = $flags;
}
# we have seen more than a declaration so clear it
$profile_data->{$profile}{$hat}{'declared'} = 0;
$profile_data->{$profile}{$hat}{path} = { }; $profile_data->{$profile}{$hat}{path} = { };
$profile_data->{$profile}{$hat}{netdomain} = { }; $profile_data->{$profile}{$hat}{netdomain} = { };
@@ -4390,7 +4399,6 @@ sub parse_profile_data {
# mark as changed so the profile will always be written out # mark as changed so the profile will always be written out
$changed{$profile} = 1; $changed{$profile} = 1;
} elsif (/^\s*\#/) { } elsif (/^\s*\#/) {
# we only currently handle initial comments # we only currently handle initial comments
if (not $profile) { if (not $profile) {