diff options
Diffstat (limited to 'perl-install/security')
| -rw-r--r-- | perl-install/security/help.pm | 187 | ||||
| -rw-r--r-- | perl-install/security/l10n.pm | 66 | ||||
| -rw-r--r-- | perl-install/security/level.pm | 82 | ||||
| -rw-r--r-- | perl-install/security/msec.pm | 55 | ||||
| -rw-r--r-- | perl-install/security/various.pm | 23 |
5 files changed, 225 insertions, 188 deletions
diff --git a/perl-install/security/help.pm b/perl-install/security/help.pm index 9300126e0..ec934e067 100644 --- a/perl-install/security/help.pm +++ b/perl-install/security/help.pm @@ -1,172 +1,139 @@ package security::help; -# !! THIS FILE WAS AUTO-GENERATED BY draksec_help.py !! -# !! DO NOT MODIFY HERE, MODIFY IN THE *MSEC* CVS !! +# This help was forked from msec internal function descriptions +# They were then reworked in order to be targeted for end users, not msec developpers + use strict; use common; our %help = ( -'accept_bogus_error_responses' => N("Arguments: (arg) - -Accept/Refuse bogus IPv4 error messages."), - -'accept_broadcasted_icmp_echo' => N("Arguments: (arg) - - Accept/Refuse broadcasted icmp echo."), - -'accept_icmp_echo' => N("Arguments: (arg) - - Accept/Refuse icmp echo."), - -'allow_autologin' => N("Arguments: (arg) - -Allow/Forbid autologin."), - -'allow_issues' => N("Arguments: (arg) - -If \fIarg\fP = ALL allow /etc/issue and /etc/issue.net to exist. If \fIarg\fP = NONE no issues are -allowed else only /etc/issue is allowed."), +'accept_bogus_error_responses' => N("Accept bogus IPv4 error messages."), -'allow_reboot' => N("Arguments: (arg) +'accept_broadcasted_icmp_echo' => N("Accept broadcasted icmp echo."), -Allow/Forbid reboot by the console user."), +'accept_icmp_echo' => N("Accept icmp echo."), -'allow_remote_root_login' => N("Arguments: (arg) +'allow_autologin' => N("Allow autologin."), -Allow/Forbid remote root login."), +'allow_issues' => + #-PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is + N("If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist. -'allow_root_login' => N("Arguments: (arg) +If set to \"None\", no issues are allowed. -Allow/Forbid direct root login."), +Else only /etc/issue is allowed."), -'allow_user_list' => N("Arguments: (arg) +'allow_reboot' => N("Allow reboot by the console user."), -Allow/Forbid the list of users on the system on display managers (kdm and gdm)."), +'allow_remote_root_login' => N("Allow remote root login."), -'allow_x_connections' => N("Arguments: (arg, listen_tcp=None) +'allow_root_login' => N("Allow direct root login."), -Allow/Forbid X connections. First arg specifies what is done -on the client side: ALL (all connections are allowed), LOCAL (only -local connection) and NONE (no connection)."), +'allow_user_list' => N("Allow the list of users on the system on display managers (kdm and gdm)."), -'allow_xserver_to_listen' => N("Arguments: (arg) +'allow_xauth_from_root' => N("Allow to export display when +passing from the root account to the other users. -The argument specifies if clients are authorized to connect -to the X server on the tcp port 6000 or not."), +See pam_xauth(8) for more details.'"), -'authorize_services' => N("Arguments: (arg) +'allow_x_connections' => N("Allow X connections: -Authorize all services controlled by tcp_wrappers (see hosts.deny(5)) if \fIarg\fP = ALL. Only local ones -if \fIarg\fP = LOCAL and none if \fIarg\fP = NONE. To authorize the services you need, use /etc/hosts.allow -(see hosts.allow(5))."), +- \"All\" (all connections are allowed), -'create_server_link' => N("Arguments: () +- \"Local\" (only connection from local machine), -If SERVER_LEVEL (or SECURE_LEVEL if absent) is greater than 3 -in /etc/security/msec/security.conf, creates the symlink /etc/security/msec/server -to point to /etc/security/msec/server.<SERVER_LEVEL>. The /etc/security/msec/server -is used by chkconfig --add to decide to add a service if it is present in the file -during the installation of packages."), +- \"None\" (no connection)."), -'enable_at_crontab' => N("Arguments: (arg) +'allow_xserver_to_listen' => N("The argument specifies if clients are authorized to connect +to the X server from the network on the tcp port 6000 or not."), -Enable/Disable crontab and at for users. Put allowed users in /etc/cron.allow and /etc/at.allow -(see man at(1) and crontab(1))."), +'authorize_services' => + #-PO: here "ALL", "Local" and "None" are values in a pull-down menu; translate them the same as they're + N("Authorize: -'enable_console_log' => N("Arguments: (arg, expr='*.*', dev='tty12') +- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\", -Enable/Disable syslog reports to console 12. \fIexpr\fP is the -expression describing what to log (see syslog.conf(5) for more details) and -dev the device to report the log."), +- only local ones if set to \"Local\" -'enable_dns_spoofing_protection' => N("Arguments: (arg, alert=1) +- none if set to \"None\". -Enable/Disable name resolution spoofing protection. If -\fIalert\fP is true, also reports to syslog."), +To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))."), -'enable_ip_spoofing_protection' => N("Arguments: (arg, alert=1) +'create_server_link' => N("If SERVER_LEVEL (or SECURE_LEVEL if absent) +is greater than 3 in /etc/security/msec/security.conf, creates the +symlink /etc/security/msec/server to point to +/etc/security/msec/server.<SERVER_LEVEL>. -Enable/Disable IP spoofing protection."), +The /etc/security/msec/server is used by chkconfig --add to decide to +add a service if it is present in the file during the installation of +packages."), -'enable_libsafe' => N("Arguments: (arg) +'enable_at_crontab' => N("Enable crontab and at for users. -Enable/Disable libsafe if libsafe is found on the system."), +Put allowed users in /etc/cron.allow and /etc/at.allow (see man at(1) +and crontab(1))."), -'enable_log_strange_packets' => N("Arguments: (arg) +'enable_console_log' => N("Enable syslog reports to console 12"), -Enable/Disable the logging of IPv4 strange packets."), +'enable_dns_spoofing_protection' => N("Enable name resolution spoofing protection. If +\"%s\" is true, also reports to syslog.", N("Security Alerts:")), -'enable_msec_cron' => N("Arguments: (arg) +'enable_ip_spoofing_protection' => N("Enable IP spoofing protection."), -Enable/Disable msec hourly security check."), +'enable_libsafe' => N("Enable libsafe if libsafe is found on the system."), -'enable_pam_wheel_for_su' => N("Arguments: (arg) +'enable_log_strange_packets' => N("Enable the logging of IPv4 strange packets."), - Enabling su only from members of the wheel group or allow su from any user."), +'enable_msec_cron' => N("Enable msec hourly security check."), -'enable_password' => N("Arguments: (arg) +'enable_pam_wheel_for_su' => N("Enable su only from members of the wheel group. If set to no, allows su from any user."), -Use password to authenticate users."), +'enable_password' => N("Use password to authenticate users."), -'enable_promisc_check' => N("Arguments: (arg) +'enable_promisc_check' => N("Activate Ethernet cards promiscuity check."), -Activate/Disable ethernet cards promiscuity check."), +'enable_security_check' => N("Activate daily security check."), -'enable_security_check' => N("Arguments: (arg) +'enable_sulogin' => N("Enable sulogin(8) in single user level."), - Activate/Disable daily security check."), +'no_password_aging_for' => N("Add the name as an exception to the handling of password aging by msec."), -'enable_sulogin' => N("Arguments: (arg) +'password_aging' => N("Set password aging to \"max\" days and delay to change to \"inactive\"."), - Enable/Disable sulogin(8) in single user level."), +'password_history' => N("Set the password history length to prevent password reuse."), -'no_password_aging_for' => N("Arguments: (name) +'password_length' => N("Set the password minimum length and minimum number of digit and minimum number of capitalized letters."), -Add the name as an exception to the handling of password aging by msec."), - -'password_aging' => N("Arguments: (max, inactive=-1) - -Set password aging to \fImax\fP days and delay to change to \fIinactive\fP."), - -'password_history' => N("Arguments: (arg) - -Set the password history length to prevent password reuse."), - -'password_length' => N("Arguments: (length, ndigits=0, nupper=0) +'set_root_umask' => N("Set the root's file mode creation mask."), +CHECK_OPEN_PORT => N("if set to yes, check open ports."), +CHECK_PASSWD => N("if set to yes, check for: -Set the password minimum length and minimum number of digit and minimum number of capitalized letters."), +- empty passwords, -'set_root_umask' => N("Arguments: (umask) +- no password in /etc/shadow -Set the root umask."), -CHECK_UNOWNED => N("if set to yes, report unowned files."), +- for users with the 0 id other than root."), +CHECK_PERMS => N("if set to yes, check permissions of files in the users' home."), +CHECK_PROMISC => N("if set to yes, check if the network devices are in promiscuous mode."), +CHECK_SECURITY => N("if set to yes, run the daily security checks."), +CHECK_SGID => N("if set to yes, check additions/removals of sgid files."), CHECK_SHADOW => N("if set to yes, check empty password in /etc/shadow."), CHECK_SUID_MD5 => N("if set to yes, verify checksum of the suid/sgid files."), -CHECK_SECURITY => N("if set to yes, run the daily security checks."), -CHECK_PASSWD => N("if set to yes, check for empty passwords, for no password in /etc/shadow and for users with the 0 id other than root."), -SYSLOG_WARN => N("if set to yes, report check result to syslog."), CHECK_SUID_ROOT => N("if set to yes, check additions/removals of suid root files."), -CHECK_PERMS => N("if set to yes, check permissions of files in the users' home."), +CHECK_UNOWNED => N("if set to yes, report unowned files."), +CHECK_WRITABLE => N("if set to yes, check files/directories writable by everybody."), CHKROOTKIT_CHECK => N("if set to yes, run chkrootkit checks."), -CHECK_PROMISC => N("if set to yes, check if the network devices are in promiscuous mode."), +MAIL_USER => N("if set, send the mail report to this email address else send it to root."), +MAIL_WARN => N("if set to yes, report check result by mail."), +MAIL_EMPTY_CONTENT => N("Do not send mails if there's nothing to warn about"), RPM_CHECK => N("if set to yes, run some checks against the rpm database."), +SYSLOG_WARN => N("if set to yes, report check result to syslog."), TTY_WARN => N("if set to yes, reports check result to tty."), -CHECK_WRITABLE => N("if set to yes, check files/directories writable by everybody."), -MAIL_WARN => N("if set to yes, report check result by mail."), -MAIL_USER => N("if set, send the mail report to this email address else send it to root."), -CHECK_OPEN_PORT => N("if set to yes, check open ports."), -CHECK_SGID => N("if set to yes, check additions/removals of sgid files."), - -'set_shell_history_size' => N("Arguments: (size) - -Set shell commands history size. A value of -1 means unlimited."), - -'set_shell_timeout' => N("Arguments: (val) -Set the shell timeout. A value of zero means no timeout."), +'set_shell_history_size' => N("Set shell commands history size. A value of -1 means unlimited."), -'set_user_umask' => N("Arguments: (umask) +'set_shell_timeout' => N("Set the shell timeout. A value of zero means no timeout.") . "\n\n" . N("Timeout unit is second"), -Set the user umask."), +'set_user_umask' => N("Set the user's file mode creation mask."), ); diff --git a/perl-install/security/l10n.pm b/perl-install/security/l10n.pm new file mode 100644 index 000000000..355f1fff1 --- /dev/null +++ b/perl-install/security/l10n.pm @@ -0,0 +1,66 @@ +package security::l10n; +# This help was build from stripped from python description of msec functions +# soft/msec/share/libmsec.py +# +# It's used in draksec option labels + +use common; + +sub fields() { + return ( + 'accept_bogus_error_responses' => N("Accept bogus IPv4 error messages"), + 'accept_broadcasted_icmp_echo' => N("Accept broadcasted icmp echo"), + 'accept_icmp_echo' => N("Accept icmp echo"), + 'allow_autologin' => N("Autologin"), + 'allow_issues' => N("/etc/issue* exist"), + 'allow_reboot' => N("Reboot by the console user"), + 'allow_remote_root_login' => N("Allow remote root login"), + 'allow_root_login' => N("Direct root login"), + 'allow_user_list' => N("List users on display managers (kdm and gdm)"), + 'allow_xauth_from_root' => N("Export display when passing from root to the other users"), + 'allow_x_connections' => N("Allow X Window connections"), + 'allow_xserver_to_listen' => N("Authorize TCP connections to X Window"), + 'authorize_services' => N("Authorize all services controlled by tcp_wrappers"), + 'create_server_link' => N("Chkconfig obey msec rules"), + 'enable_at_crontab' => N("Enable \"crontab\" and \"at\" for users"), + 'enable_console_log' => N("Syslog reports to console 12"), + 'enable_dns_spoofing_protection' => N("Name resolution spoofing protection"), + 'enable_ip_spoofing_protection' => N("Enable IP spoofing protection"), + 'enable_libsafe' => N("Enable libsafe if libsafe is found on the system"), + 'enable_log_strange_packets' => N("Enable the logging of IPv4 strange packets"), + 'enable_msec_cron' => N("Enable msec hourly security check"), + 'enable_pam_wheel_for_su' => N("Enable su only from the wheel group members"), + 'enable_password' => N("Use password to authenticate users"), + 'enable_promisc_check' => N("Ethernet cards promiscuity check"), + 'enable_security_check' => N("Daily security check"), + 'enable_sulogin' => N("Sulogin(8) in single user level"), + 'no_password_aging_for' => N("No password aging for"), + 'password_aging' => N("Set password expiration and account inactivation delays"), + 'password_history' => N("Password history length"), + 'password_length' => N("Password minimum length and number of digits and upcase letters"), + 'set_root_umask' => N("Root umask"), + 'set_shell_history_size' => N("Shell history size"), + 'set_shell_timeout' => N("Shell timeout"), + 'set_user_umask' => N("User umask"), + CHECK_OPEN_PORT => N("Check open ports"), + CHECK_PASSWD => N("Check for unsecured accounts"), + CHECK_PERMS => N("Check permissions of files in the users' home"), + CHECK_PROMISC => N("Check if the network devices are in promiscuous mode"), + CHECK_SECURITY => N("Run the daily security checks"), + CHECK_SGID => N("Check additions/removals of sgid files"), + CHECK_SHADOW => N("Check empty password in /etc/shadow"), + CHECK_SUID_MD5 => N("Verify checksum of the suid/sgid files"), + CHECK_SUID_ROOT => N("Check additions/removals of suid root files"), + CHECK_UNOWNED => N("Report unowned files"), + CHECK_WRITABLE => N("Check files/directories writable by everybody"), + CHKROOTKIT_CHECK => N("Run chkrootkit checks"), + MAIL_EMPTY_CONTENT => N("Do not send empty mail reports"), + MAIL_USER => N("If set, send the mail report to this email address else send it to root"), + MAIL_WARN => N("Report check result by mail"), + RPM_CHECK => N("Run some checks against the rpm database"), + SYSLOG_WARN => N("Report check result to syslog"), + TTY_WARN => N("Reports check result to tty"), + ); +} + +1; diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm index 234fb2d4b..bb3d9ddf2 100644 --- a/perl-install/security/level.pm +++ b/perl-install/security/level.pm @@ -3,65 +3,75 @@ package security::level; use strict; use common; use run_program; +# perl_checker: require interactive - -sub level_list { +sub level_list() { ( - 0 => N("Welcome To Crackers"), - 1 => N("Poor"), - 2 => N("Standard"), - 3 => N("High"), - 4 => N("Higher"), - 5 => N("Paranoid"), + 0 => N("Disable msec"), + 1 => N("Standard"), + 2 => N("Secure"), ); } sub to_string { +{ level_list() }->{$_[0]} } sub from_string { +{ reverse level_list() }->{$_[0]} || 2 } -sub get_string { to_string(get() || 2) } -sub get_common_list { map { to_string($_) } (2, 3, 4) } +sub rawlevel_list() { + ( + 0 => 'none', + 1 => 'standard', + 2 => 'secure', + ); +} + +sub to_lowlevel_string { +{ rawlevel_list() }->{$_[0]} } +sub from_lowlevel_string { +{ reverse rawlevel_list() }->{$_[0]} || 2 } + +sub get_string() { to_string(get() || 2) } +sub get_common_list() { map { to_string($_) } (1, 2, 3, 4, 5) } -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}; +sub get() { + my $level = ${{ getVarsFromSh("$::prefix/etc/security/msec/security.conf") }}{BASE_LEVEL} || #- 2009.1 msec + "standard"; + from_lowlevel_string($level); } sub set { my ($security) = @_; - run_program::rooted($::prefix, 'msec', '-o', 'run_commands=0', '-o', 'log=stderr', $security || 3); + my @levelnames = ('none', 'standard', 'secure'); + # 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', $levelnames[$security]); } sub level_choose { - my ($in, $security, $libsafe, $email) = @_; + my ($in, $security, $email) = @_; # perl_checker: $in = interactive->new my %help = ( - 0 => N("This level is to be used with care. It makes your system more easy to use, -but very sensitive. It must not be used for a machine connected to others -or to the Internet. There is no password access."), - 1 => N("Passwords are now enabled, but use as a networked computer is still not recommended."), - 2 => N("This is the standard security recommended for a computer that will be used to connect to the Internet as a client."), - 3 => N("There are already some restrictions, and more automatic checks are run every night."), - 4 => N("With this security level, the use of this system as a server becomes possible. + 0 => N("This level is to be used with care, as it disables all additional security +provided by msec. Use it only when you want to take care of all aspects of system security +on your own."), + 1 => N("This is the standard security recommended for a computer that will be used to connect to the Internet as a client."), + 2 => N("With this security level, the use of this system as a server becomes possible. The security is now high enough to use the system as a server which can accept connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level."), - 5 => N("This is similar to the previous level, but the system is entirely closed and security features are at their maximum."), ); - my @l = 2 .. 5; + my @l = 1 .. 2; - $in->ask_from_({ title => N("DrakSec Basic Options"), - messages => N("Please choose the desired security level") . "\n\n" . - join('', map { to_string($_) . ": " . formatAlaTeX($help{$_}) . "\n\n" } @l), - interactive_help_id => 'miscellaneous', - }, [ - { label => N("Security level"), val => $security, list => \@l, format => \&to_string }, - if_($in->do_pkgs->is_installed('libsafe') && arch() =~ /^i.86/, - { label => N("Use libsafe for servers"), val => $libsafe, type => 'bool', text => - N("A library which defends against buffer overflow and format string attacks.") }), - { label => N("Security Administrator (login or email)"), val => $email, }, + $in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"), + interactive_help_id => 'securityLevel', + }, [ + { label => N("Please choose the desired security level"), title => 1 }, + { val => $security, list => \@l, + format => sub { + #-PO: this string is used to properly format "<security level>: <level description>" + N("%s: %s", to_string($_[0]), formatAlaTeX($help{$_[0]})); + }, + type => 'list', gtk => { use_boxradio => 1 } }, + { label => N("Security Administrator:"), title => 1 }, + { label => N("Login or email:"), val => $email, }, ], ); } diff --git a/perl-install/security/msec.pm b/perl-install/security/msec.pm index c672d0cb1..4258653ef 100644 --- a/perl-install/security/msec.pm +++ b/perl-install/security/msec.pm @@ -1,7 +1,6 @@ package security::msec; use strict; -use MDK::Common::File; use MDK::Common; @@ -16,10 +15,10 @@ sub load_defaults { my ($msec, $category) = @_; my $separator = $msec->{$category}{def_separator}; map { - my ($opt, $val) = split /$separator/; + my ($opt, $val) = split(/$separator/, $_, 2); chop $val; if_($opt ne 'set_security_conf', $opt => $val); - } cat_($msec->{$category}{defaults_file}); + } cat_($msec->{$category}{defaults_file}), if_($category eq "checks", 'MAIL_USER'); } @@ -49,7 +48,7 @@ sub load_values { chop $val; $val =~ s/[()]//g; chop $opt if $separator eq '\('; # $opt =~ s/ //g if $separator eq '\('; - if_($val, $opt => $val); + if_(defined($val), $opt => $val); } cat_($msec->{$category}{values_file}); } @@ -60,7 +59,7 @@ sub load_values { sub get_function_value { my ($msec, $function) = @_; - $msec->{functions}{value}{$function} || "default"; + exists $msec->{functions}{value}{$function} ? $msec->{functions}{value}{$function} : "default"; } sub get_check_value { @@ -76,9 +75,14 @@ sub get_check_value { # list_(functions|checks) - # return a list of functions|checks handled by level.local|security.conf +sub raw_checks_list { + my ($msec) = @_; + keys %{$msec->{checks}{default}}; +} + sub list_checks { my ($msec) = @_; - map { if_(!member($_, qw(MAIL_WARN MAIL_USER)), $_) } keys %{$msec->{checks}{default}}; + difference2([ $msec->raw_checks_list ], [ qw(MAIL_WARN MAIL_USER) ]); } sub list_functions { @@ -93,7 +97,7 @@ sub list_functions { enable_dns_spoofing_protection enable_ip_spoofing_protection enable_log_strange_packets enable_promisc_check no_password_aging_for)], 'system' => [qw(allow_autologin allow_issues allow_reboot allow_remote_root_login - allow_root_login allow_user_list allow_x_connections allow_xserver_to_listen + allow_root_login allow_user_list allow_xauth_from_root allow_x_connections allow_xserver_to_listen authorize_services enable_at_crontab enable_console_log enable_msec_cron enable_pam_wheel_for_su enable_password enable_security_check enable_sulogin password_aging password_history password_length set_root_umask @@ -101,7 +105,7 @@ sub list_functions { # get all function names; filter out those which are in the ignore # list, return what lefts. - map { if_(!member($_, @ignore_list) && member($_, @{$options{$category}}), $_) } keys %{$msec->{functions}{default}}; + grep { !member($_, @ignore_list) && member($_, @{$options{$category}}) } keys %{$msec->{functions}{default}}; } @@ -127,43 +131,42 @@ sub set_check { sub apply_functions { my ($msec) = @_; - my @list = ($msec->list_functions('system'), $msec->list_functions('network')); + my @list = sort($msec->list_functions('system'), $msec->list_functions('network')); + touch($msec->{functions}{values_file}) if !-e $msec->{functions}{values_file}; substInFile { foreach my $function (@list) { s/^$function.*\n// } if (eof) { - print "\n", join("\n", map { + $_ .= join("\n", if_(!$_, ''), (map { my $value = $msec->get_function_value($_); if_($value ne 'default', "$_ ($value)"); - } @list); + } @list), ""); } } $msec->{functions}{values_file}; } sub apply_checks { my ($msec) = @_; - my @list = $msec->list_checks; - substInFile { - foreach my $check (@list) { s/^$check.*\n// } - if (eof) { - print "\n", join("\n", map { - my $value = $msec->get_check_value($_); - if_($value ne 'default', $_ . '=' . $value); - } @list), "\n"; - } - } $msec->{checks}{values_file}; + my @list = sort $msec->raw_checks_list; + setVarsInSh($msec->{checks}{values_file}, + { + map { + my $value = $msec->get_check_value($_); + if_($value ne 'default', $_ => $value); + } @list + } + ); } sub reload { my ($msec) = @_; - my $num_level = 0; require security::level; - $num_level ||= security::level::get(); - $msec->{functions}{defaults_file} = "$::prefix/usr/share/msec/level.".$num_level; + my $num_level = security::level::get(); + $msec->{functions}{defaults_file} = "$::prefix/usr/share/msec/level.$num_level"; $msec->{functions}{default} = { $msec->load_defaults('functions') }; } sub new { - my $type = shift; + my ($type) = @_; my $msec = bless {}, $type; $msec->{functions}{values_file} = "$::prefix/etc/security/msec/level.local"; @@ -173,7 +176,7 @@ sub new { $msec->{functions}{val_separator} = '\('; $msec->{checks}{def_separator} = '='; $msec->{functions}{def_separator} = ' '; - $msec->reload(); + $msec->reload; $msec->{checks}{default} = { $msec->load_defaults('checks') }; $msec->{functions}{value} = { $msec->load_values('functions') }; diff --git a/perl-install/security/various.pm b/perl-install/security/various.pm index 7d63c7fdc..2e4abd397 100644 --- a/perl-install/security/various.pm +++ b/perl-install/security/various.pm @@ -1,28 +1,19 @@ -package security::various; # $Id$ +package security::various; use diagnostics; use strict; use common; -sub config_libsafe { - my ($prefix, $libsafe) = @_; - my %t = getVarsFromSh("$prefix/etc/sysconfig/system"); - if (@_ > 1) { - $t{LIBSAFE} = bool2yesno($libsafe); - setVarsInSh("$prefix/etc/sysconfig/system", \%t); - } - text2bool($t{LIBSAFE}); -} - sub config_security_user { + my $setting = @_ > 1; my ($prefix, $sec_user) = @_; - my %t = getVarsFromSh("$prefix/etc/security/msec/security.conf"); - if (@_ > 1) { - $t{MAIL_USER} = $sec_user; - setVarsInSh("$prefix/etc/security/msec/security.conf", \%t); + if ($setting) { + addVarsInSh("$prefix/etc/security/msec/security.conf", { MAIL_USER => $sec_user }); + } else { + my %t = getVarsFromSh("$prefix/etc/security/msec/security.conf"); + $t{MAIL_USER}; } - $t{MAIL_USER}; } 1; |