mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 15:55:46 +00:00
Code Issues Releases Wiki Activity

Make rpc-xml optional (only needed if repository is used)

Browse Source
This commit is contained in:
John Johansen
2008-02-19 18:50:36 +00:00
parent 1421b0b366
commit 7140ac64a3
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
utils/SubDomain.pm
View File

@@ -32,8 +32,6 @@ use Data::Dumper;
use Locale::gettext; use Locale::gettext;
use POSIX; use POSIX;
use RPC::XML;
use RPC::XML::Client;
use Storable qw(dclone); use Storable qw(dclone);
use Term::ReadKey; use Term::ReadKey;
@@ -151,6 +149,8 @@ our $seenevents = 0;
our $cfg; our $cfg;
our $repo_cfg; our $repo_cfg;
our $is_rpc_xml = 0;
# these are globs that the user specifically entered. we'll keep track of # these are globs that the user specifically entered. we'll keep track of
# them so that if one later matches, we'll suggest it again. # them so that if one later matches, we'll suggest it again.
our @userglobs; our @userglobs;
@@ -3150,7 +3150,8 @@ sub matchnetincludes ($$$$) {
sub repo_is_enabled { sub repo_is_enabled {
my $enabled; my $enabled;
if ($cfg->{repository}{url} && if ($is_rpc_xml == 1 &&
$cfg->{repository}{url} &&
$repo_cfg && $repo_cfg &&
$repo_cfg->{repository}{enabled} && $repo_cfg->{repository}{enabled} &&
$repo_cfg->{repository}{enabled} eq "yes") { $repo_cfg->{repository}{enabled} eq "yes") {
@@ -3164,6 +3165,7 @@ sub ask_to_enable_repo {
my $q = { }; my $q = { };
return if ( not defined $cfg->{repository}{url} ); return if ( not defined $cfg->{repository}{url} );
return if ($is_rpc_xml == 0);
$q->{headers} = [ $q->{headers} = [
"Repository", $cfg->{repository}{url}, "Repository", $cfg->{repository}{url},
]; ];
@@ -3363,8 +3365,8 @@ sub do_logprof_pass {
eval { eval {
unless ($repo_cfg || not defined $cfg->{repository}{url}) { unless ($repo_cfg || not defined $cfg->{repository}{url}) {
$repo_cfg = read_config("repository.conf"); $repo_cfg = read_config("repository.conf");
unless ($repo_cfg->{repository}{enabled} eq "yes" || unless ($repo_cfg && $repo_cfg->{repository}{enabled} eq "yes" ||
$repo_cfg->{repository}{enabled} eq "no") { $repo_cfg && $repo_cfg->{repository}{enabled} eq "no") {
ask_to_enable_repo(); ask_to_enable_repo();
} }
} }
@@ -5400,6 +5402,24 @@ sub Text_PromptUser ($) {
$cfg = read_config("logprof.conf"); $cfg = read_config("logprof.conf");
eval "use RPC::XML";
if (!$@) {
eval "use RPC::XML::Client";
if (!$@) {
$is_rpc_xml = 1;
} else {
$is_rpc_xml = 0;
}
} else {
$is_rpc_xml = 0;
if ($repo_cfg &&
$repo_cfg->{repository}{enabled} &&
$repo_cfg->{repository}{enabled} eq "yes") {
#hmm log message that repository is disabled because rpc-xml is not found
#or abort with message to disable repository or install rpc-xml
}
}
$profiledir = find_first_dir($cfg->{settings}{profiledir}) || "/etc/apparmor.d"; $profiledir = find_first_dir($cfg->{settings}{profiledir}) || "/etc/apparmor.d";
unless (-d $profiledir) { fatal_error "Can't find AppArmor profiles."; } unless (-d $profiledir) { fatal_error "Can't find AppArmor profiles."; }