summaryrefslogtreecommitdiffstats
path: root/perl-install/security
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-09-17 09:10:20 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-09-17 09:10:20 +0000
commitfb4cc35d796285036654a18710bc5d6685d203a8 (patch)
tree826e09abe980d0687dcf36936516956f11c1b321 /perl-install/security
parent3c69aa6a5c8fb9749b25a8f1c7f15ec7e6ea54ea (diff)
downloaddrakx-fb4cc35d796285036654a18710bc5d6685d203a8.tar
drakx-fb4cc35d796285036654a18710bc5d6685d203a8.tar.gz
drakx-fb4cc35d796285036654a18710bc5d6685d203a8.tar.bz2
drakx-fb4cc35d796285036654a18710bc5d6685d203a8.tar.xz
drakx-fb4cc35d796285036654a18710bc5d6685d203a8.zip
- security::main: kill duplicated 'use strict'
- no ignore choice for periodic checks - save functions in /etc/security/msec/level.local and not security.conf - "from mseclib import" is useless - fix functions saving (an object method invocation takes class name as argument)
Diffstat (limited to 'perl-install/security')
-rw-r--r--perl-install/security/main.pm7
-rw-r--r--perl-install/security/msec.pm2
2 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm
index 30719910d..e76779308 100644
--- a/perl-install/security/main.pm
+++ b/perl-install/security/main.pm
@@ -1,5 +1,4 @@
use strict;
-use standalone;
use standalone;
use MDK::Common;
@@ -159,7 +158,7 @@ sub system_generate_page {
sub checks_generate_page {
my ($rsecurity_checks_hash, $msec) = @_;
my @security_checks = $msec->get_checks('');
- my @choices = qw(yes no default ignore);
+ my @choices = qw(yes no default);
my @ignore_list = qw(MAIL_WARN MAIL_USER);
my @items;
@@ -279,13 +278,13 @@ sub draksec_main {
standalone::explanations("Setting msec functions related to networking");
foreach my $key (keys %network_options_value) {
if($network_options_value{$key} =~ /Combo/) { $msec->config_function('', $key, $network_options_value{$key}->entry->get_text()) }
- else { $msec->config_check('', $key, $network_options_value{$key}->get_text()) }
+ else { $msec->config_function('', $key, $network_options_value{$key}->get_text()) }
}
standalone::explanations("Setting msec functions related to the system");
foreach my $key (keys %system_options_value) {
if($system_options_value{$key} =~ /Combo/) { $msec->config_function('', $key, $system_options_value{$key}->entry->get_text()) }
- else { $msec->config_check('', $key, $system_options_value{$key}->get_text()) }
+ else { $msec->config_function('', $key, $system_options_value{$key}->get_text()) }
}
remove_wait_msg($w);
diff --git a/perl-install/security/msec.pm b/perl-install/security/msec.pm
index 2ca6fa6cf..c8b206678 100644
--- a/perl-install/security/msec.pm
+++ b/perl-install/security/msec.pm
@@ -86,7 +86,6 @@ sub config_option {
$options_hash{$option} = $value;
open F, '>'.$options_file;
- if ($category eq "functions") { print F "from mseclib import *\n\n"; }
foreach $key (keys %options_hash) {
if ($options_hash{$key} ne "default") {
if($category eq "functions") { print F "$key"."($options_hash{$key})\n"; }
@@ -264,6 +263,7 @@ sub get_function_default {
# config_function(prefix, function, value) -
# Apply the configuration to 'prefix'/etc/security/msec/level.local
sub config_function {
+ shift @_;
my ($prefix, $function, $value) = @_;
config_option($prefix, $function, $value, "functions");
}