From 6f5bc70ae10e7b5de0d571d61dbcfc17f76e6e3c Mon Sep 17 00:00:00 2001 From: Dominic Reynolds Date: Sun, 29 Jul 2007 02:17:17 +0000 Subject: [PATCH] Updated usage of SubDomain::readprofile() (which changed in r620) in yast apparmor profile agent and syntax checking function in subdomain.pm --- management/yastui/src/agents/ag_subdomain_profiles | 3 ++- utils/SubDomain.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/management/yastui/src/agents/ag_subdomain_profiles b/management/yastui/src/agents/ag_subdomain_profiles index c3a725c34..c087137f3 100755 --- a/management/yastui/src/agents/ag_subdomain_profiles +++ b/management/yastui/src/agents/ag_subdomain_profiles @@ -95,7 +95,8 @@ while ( ) { } } elsif ( $command eq "Read") { $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 ); } elsif ( $command eq "Write" and $path eq ".delete") { if ( $argument ne "" ) { diff --git a/utils/SubDomain.pm b/utils/SubDomain.pm index 4fef4ec03..cf63273d9 100755 --- a/utils/SubDomain.pm +++ b/utils/SubDomain.pm @@ -3682,7 +3682,7 @@ sub checkProfileSyntax ($) { or fatal_error "Can't read AppArmor profiles in $profiledir."; for my $file (grep { -f "$profiledir/$_" } readdir(SDDIR)) { next if isSkippableFile($file); - my $err = readprofile("$profiledir/$file", \&printMessageErrorHandler); + my $err = readprofile("$profiledir/$file", \&printMessageErrorHandler, 1); if (defined $err and $err ne "") { push @$errors, $err; }