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

fix repository profile saving, where the name for profiles from the repository got lost on saving

Browse Source
This commit is contained in:
John Johansen
2008-06-03 10:38:19 +00:00
parent 838d22220a
commit cb9f84a61e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/SubDomain.pm
View File

@@ -545,7 +545,7 @@ sub name_to_prof_filename($) {
my $bin = shift;
my $filename;
unless ($bin =~ /^($profiledir|profile_)/) {
unless ($bin =~ /^($profiledir)/) {
my $fqdbin = findexecutable($bin);
if ($fqdbin) {
$filename = getprofilefilename($fqdbin);
@@ -555,15 +555,15 @@ sub name_to_prof_filename($) {
if ($bin =~ /^$profiledir(.*)/) {
my $profile = $1;
return ($bin, $profile) if -f $bin;
return ($bin, $profile);
} elsif ($bin =~ /^\//) {
$filename = getprofilefilename($bin);
return ($filename, $bin) if -f $filename;
return ($filename, $bin);
} else {
# not an absolute path try it as a profile_
$bin = $1 if ($bin !~ /^profile_(.*)/);
$filename = getprofilefilename($bin);
return ($filename, "profile_${bin}") if -f $filename;
return ($filename, "profile_${bin}");
}
return undef;
}
@@ -726,7 +726,7 @@ sub create_new_profile {
# if the executable exists on this system, pull in extra dependencies
if (-f $fqdbin) {
my $hashbang = head($fqdbin);
if ($hashbang =~ /^#!\s*(\S+)/) {
if ($hashband && $hashbang =~ /^#!\s*(\S+)/) {
my $interpreter = get_full_path($1);
$profile->{$fqdbin}{allow}{path}->{$interpreter}{mode} = str_to_mode("ix");
$profile->{$fqdbin}{allow}{path}->{$interpreter}{audit} = 0;
@@ -2930,7 +2930,7 @@ sub UI_SelectUpdatedRepoProfile ($$) {
if ($ans eq "CMD_UPDATE_PROFILE") {
eval {
my $profile_data =
parse_profile_data($p->{profile}, "repository profile", 0);
parse_profile_data($p->{profile}, getprofilefilename($profile), 0);
if ($profile_data) {
attach_profile_data(\%sd, $profile_data);
$changed{$profile} = 1;
@@ -3090,7 +3090,7 @@ sub parse_repo_profile {
my ($fqdbin, $repo_url, $profile) = @_;
my $profile_data = eval {
parse_profile_data($profile->{profile}, "repository profile", 0);
parse_profile_data($profile->{profile}, getprofilefilename($fqdbin), 0);
};
if ($@) {
print STDERR "PARSING ERROR: $@\n";