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

Updated usage of SubDomain::readprofile() (which changed in r620) in

Browse Source 
yast apparmor profile agent and syntax checking function in subdomain.pm
This commit is contained in:
Dominic Reynolds
2007-07-29 02:17:17 +00:00
parent 9e35713fa6
commit 6f5bc70ae1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
management/yastui/src/agents/ag_subdomain_profiles
View File

@@ -95,7 +95,8 @@ while ( <STDIN> ) {
} }
} elsif ( $command eq "Read") { } elsif ( $command eq "Read") {
$UI_Mode = "yast"; $UI_Mode = "yast";
Immunix::SubDomain::readprofile("$profiledir/$argument", \&$Immunix::SubDomain::fatal_error); Immunix::SubDomain::readprofile("$profiledir/$argument",
\&$Immunix::SubDomain::fatal_error, 1);
ycp::Return( \%sd ); ycp::Return( \%sd );
} elsif ( $command eq "Write" and $path eq ".delete") { } elsif ( $command eq "Write" and $path eq ".delete") {
if ( $argument ne "" ) { if ( $argument ne "" ) {

2
utils/SubDomain.pm
View File

@@ -3682,7 +3682,7 @@ sub checkProfileSyntax ($) {
or fatal_error "Can't read AppArmor profiles in $profiledir."; or fatal_error "Can't read AppArmor profiles in $profiledir.";
for my $file (grep { -f "$profiledir/$_" } readdir(SDDIR)) { for my $file (grep { -f "$profiledir/$_" } readdir(SDDIR)) {
next if isSkippableFile($file); next if isSkippableFile($file);
my $err = readprofile("$profiledir/$file", \&printMessageErrorHandler); my $err = readprofile("$profiledir/$file", \&printMessageErrorHandler, 1);
if (defined $err and $err ne "") { if (defined $err and $err ne "") {
push @$errors, $err; push @$errors, $err;
} }