mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 06:16:03 +00:00
Code Issues Releases Wiki Activity

This patch makes the utils tools consistent with the initscript as to

Browse Source 
which sets of files they ignore (rpm backups, dotfiles, and emacs
backups). It moves the tests into a common function so that
modifications only need to occur in one location.
This commit is contained in:
Steve Beattie
2007-03-23 18:52:22 +00:00
parent ee3f92d459
commit f5109ad203
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
utils/SubDomain.pm
View File

@@ -87,6 +87,8 @@ our @EXPORT = qw(
checkProfileSyntax
checkIncludeSyntax
isSkippableFile
);
our $confdir = "/etc/apparmor";
@@ -2305,6 +2307,16 @@ sub contains ($$) {
return 1;
}
# isSkippableFile - return true if filename matches something that
# should be skipped (rpm backup files, dotfiles, emacs backup files
sub isSkippableFile($) {
my $path = shift;
return ($path =~ /(^|\/)\.[^\/]*$/
|| $path =~ /\.rpm(save|new)$/
|| $path =~ /\~$/);
}
sub checkIncludeSyntax($) {
my $errors = shift;
@@ -2315,7 +2327,7 @@ sub checkIncludeSyntax($) {
if (opendir(SDDIR, "$profiledir/$id")) {
for my $path (grep { !/^\./ } readdir(SDDIR)) {
chomp($path);
next if $path =~ /\.rpm(save|new)$/;
next if isSkippableFile($path);
if (-f "$profiledir/$id/$path") {
my $file = "$id/$path";
$file =~ s/$profiledir\///;
@@ -2342,7 +2354,7 @@ sub checkProfileSyntax ($) {
opendir(SDDIR, $profiledir)
or fatal_error "Can't read AppArmor profiles in $profiledir.";
for my $file (grep { -f "$profiledir/$_" } readdir(SDDIR)) {
next if $file =~ /\.rpm(save|new)$/;
next if isSkippableFile($file);
my $err = readprofile("$profiledir/$file", \&printMessageErrorHandler);
if (defined $err and $err ne 1) {
push @$errors, $err;
@@ -2361,7 +2373,7 @@ sub readprofiles () {
opendir(SDDIR, $profiledir)
or fatal_error "Can't read AppArmor profiles in $profiledir.";
for my $file (grep { -f "$profiledir/$_" } readdir(SDDIR)) {
next if $file =~ /\.rpm(save|new)$/;
next if isSkippableFile($file);
readprofile("$profiledir/$file", \&fatal_error);
}
closedir(SDDIR);
@@ -3004,9 +3016,9 @@ sub loadincludes {
while (my $id = shift @incdirs) {
if (opendir(SDDIR, "$profiledir/$id")) {
for my $path (grep { !/^\./ } readdir(SDDIR)) {
for my $path (readdir(SDDIR)) {
chomp($path);
next if $path =~ /\.rpm(save|new)$/;
next if isSkippableFile($path);
if (-f "$profiledir/$id/$path") {
my $file = "$id/$path";
$file =~ s/$profiledir\///;