summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-24 14:03:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-24 14:03:52 +0000
commit2214400b9d9b927eb06877618212593c7dffc75b (patch)
tree9cfbe50fd8ce4122ec4b622ef266560fdaff5d21
parent9f332be09e4b313e74a135a847b82f7a1ccfc64a (diff)
downloaddrakx-backup-do-not-use-2214400b9d9b927eb06877618212593c7dffc75b.tar
drakx-backup-do-not-use-2214400b9d9b927eb06877618212593c7dffc75b.tar.gz
drakx-backup-do-not-use-2214400b9d9b927eb06877618212593c7dffc75b.tar.bz2
drakx-backup-do-not-use-2214400b9d9b927eb06877618212593c7dffc75b.tar.xz
drakx-backup-do-not-use-2214400b9d9b927eb06877618212593c7dffc75b.zip
really default security level 3
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/security/level.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7705794ee..96c8bf0e6 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -913,7 +913,7 @@ sub miscellaneousBefore {
$o->{miscellaneous}{HDPARM} = $s{HDPARM} if exists $s{HDPARM};
require security::level;
require security::various;
- $o->{security} ||= security::level::get() || 3;
+ $o->{security} ||= security::level::get();
$o->{security_user} ||= security::various::config_security_user($o->{prefix});
$o->{libsafe} ||= security::various::config_libsafe($o->{prefix});
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index c6a260c74..c8974f3bf 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -26,7 +26,7 @@ sub get() {
cat_("$::prefix/etc/profile") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.0 msec
cat_("$::prefix/etc/profile.d/msec.sh") =~ /export SECURE_LEVEL=(\d+)/ && $1 || #- 8.1 msec
${{ getVarsFromSh("$::prefix/etc/sysconfig/msec") }}{SECURE_LEVEL} || #- 8.2 msec
- $ENV{SECURE_LEVEL} || 2;
+ $ENV{SECURE_LEVEL} || 3;
}
sub set {