From 2214400b9d9b927eb06877618212593c7dffc75b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 24 Mar 2005 14:03:52 +0000
Subject: really default security level 3

---
 perl-install/install_steps.pm  | 2 +-
 perl-install/security/level.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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 {
-- 
cgit v1.2.1