summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-08-10 01:30:15 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-08-10 01:30:15 +0000
commitbb8981f8464e3b8e2a44528a0f3b54ae83dba697 (patch)
tree7785ce5a756a5d8345ba7a24343feec73aeaca8d
parent09952181425ab32879e07884b3484cd0fdf9f4c2 (diff)
downloaddrakx-bb8981f8464e3b8e2a44528a0f3b54ae83dba697.tar
drakx-bb8981f8464e3b8e2a44528a0f3b54ae83dba697.tar.gz
drakx-bb8981f8464e3b8e2a44528a0f3b54ae83dba697.tar.bz2
drakx-bb8981f8464e3b8e2a44528a0f3b54ae83dba697.tar.xz
drakx-bb8981f8464e3b8e2a44528a0f3b54ae83dba697.zip
Use any::get_secure_level() instead of printer::get_security_level().
-rw-r--r--perl-install/printer.pm20
-rw-r--r--perl-install/printerdrake.pm2
2 files changed, 1 insertions, 21 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 37e9be636..d64e47429 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -307,26 +307,6 @@ sub network_running {
return 0;
}
-sub get_security_level {
- # Get security level by reading /etc/profile (only after install).
- # This is a preliminary solution until msec puts the security level
- # definition into the correct file.
- $file = "/etc/profile";
- if (-f $file) {
- local *F;
- open F, "< $file" || return 0;
- while (my $line = <F>) {
- if ($line =~ /^\s*SECURE_LEVEL=([0-5])\s*$/) {
- close F;
- return $1;
- }
- }
- close F;
- }
- return 0;
-}
-
-
sub spooler_in_security_level {
# Was the current spooler already added to the current security level?
my ($spooler, $level) = @_;
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index d190638d8..722f81622 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2419,7 +2419,7 @@ sub security_check {
if ($::isInstall) {
$security = $in->{security};
} else {
- $security = printer::get_security_level();
+ $security = any::get_secure_level();
}
# Exit silently if the spooler is PDQ