summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2011-05-27 13:20:27 +0000
committerAnne Nicolas <ennael@mageia.org>2011-05-27 13:20:27 +0000
commit8e5cdf214200f3a7c603aa19d30b163b6bf88e16 (patch)
treee73d47895127baa6c72faef3f61f0b9bc7a31f3c
parent0d64c9582d78bd263db64c9652399eeae75bd6f1 (diff)
downloaddrakx-8e5cdf214200f3a7c603aa19d30b163b6bf88e16.tar
drakx-8e5cdf214200f3a7c603aa19d30b163b6bf88e16.tar.gz
drakx-8e5cdf214200f3a7c603aa19d30b163b6bf88e16.tar.bz2
drakx-8e5cdf214200f3a7c603aa19d30b163b6bf88e16.tar.xz
drakx-8e5cdf214200f3a7c603aa19d30b163b6bf88e16.zip
fix default level being 'standard' (Thierry Vignaud)
-rw-r--r--perl-install/install/NEWS6
-rw-r--r--perl-install/security/level.pm4
2 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1b8f0db41..c31637eed 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,9 @@
+Version 13.58 - 27 May 2011
+
+- fix default level being 'standard' when /etc/security/msec/security.conf
+ doesn't containt BASE_LEVEL
+ (broken since msec config file format was gratuitously changed)
+
Version 13.57 - 25 May 2011
- update translations
diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm
index 51fe4b853..b12caf19e 100644
--- a/perl-install/security/level.pm
+++ b/perl-install/security/level.pm
@@ -32,7 +32,7 @@ sub get_common_list() { map { to_string($_) } (1, 2, 3, 4, 5) }
sub get() {
my $level = ${{ getVarsFromSh("$::prefix/etc/security/msec/security.conf") }}{BASE_LEVEL} || #- 2009.1 msec
- 1;
+ "standard";
from_lowlevel_string($level);
}
@@ -42,7 +42,7 @@ sub set {
# use Standard level if specified level is out of range
$security = 1 if $security > $#levelnames;
run_program::rooted($::prefix, 'msec', '-q', '-f', @levelnames[$security]);
- run_program::rooted($::prefix, 'msecperms', '-q', '-e', '-f', @levelnames[$security]);
+ run_program::rooted($::prefix, 'msecperms', '-q', '-e', @levelnames[$security]);
}
sub level_choose {