diff options
| -rw-r--r-- | src/msec/config.py | 40 | ||||
| -rwxr-xr-x | src/msec/libmsec.py | 6 |
2 files changed, 1 insertions, 45 deletions
diff --git a/src/msec/config.py b/src/msec/config.py index 1aa5caa..1638cd7 100644 --- a/src/msec/config.py +++ b/src/msec/config.py @@ -143,46 +143,6 @@ def find_doc(msec, option, cached=None): return doc -# mandriva security tools -AUTH_NO_PASSWD = _("No password") -AUTH_ROOT_PASSWD = _("Root password") -AUTH_USER_PASSWD = _("User password") - -# mandriva drakx tools -MANDRIVA_TOOLS = { - "rpmdrake": _("Software Management"), - "mandrivaupdate": _("Mandriva Update"), - "drakrpm-edit-media": _("Software Media Manager"), - "drak3d": _("Configure 3D Desktop effects"), - "xfdrake": _("Graphical Server Configuration"), - "drakmouse": _("Mouse Configuration"), - "drakkeyboard": _("Keyboard Configuration"), - "drakups": _("UPS Configuration"), - "drakconnect": _("Network Configuration"), - "drakhosts": _("Hosts definitions"), - "draknetcenter": _("Network Center"), - "drakvpn": _("VPN"), - "drakproxy": _("Proxy Configuration"), - "drakgw": _("Connection Sharing"), - "drakauth": _("Authentication"), - "drakbackup": _("Backups"), - "drakfont": _("Import fonts"), - "draklog": _("Logs"), - "drakxservices": _("Services"), - "userdrake": _("Users"), - "drakclock": _("Date, Clock & Time Zone Settings"), - "drakboot": _("Boot Configuration"), - } - -# drakx tool groups -MANDRIVA_TOOL_GROUPS = [ - ( _("Software Management"), ['rpmdrake', 'mandrivaupdate', 'drakrpm-edit-media'] ), - ( _("Hardware"), ['drak3d', 'xfdrake', 'drakmouse', 'drakkeyboard', 'drakups'] ), - ( _("Network"), ['drakconnect', 'drakhosts', 'draknetcenter', 'drakvpn', 'drakproxy', 'drakgw'] ), - ( _("System"), ['drakauth', 'drakbackup', 'drakfont', 'draklog', 'drakxservices', 'userdrake', 'drakclock'] ), - ( _("Boot"), ['drakboot'] ), - ] - def find_callback(param): '''Finds a callback for security option''' if param not in SETTINGS: diff --git a/src/msec/libmsec.py b/src/msec/libmsec.py index 1cc4da3..98a022d 100755 --- a/src/msec/libmsec.py +++ b/src/msec/libmsec.py @@ -82,7 +82,6 @@ ISSUE = '/etc/issue' ISSUENET = '/etc/issue.net' KDE = '/etc/pam.d/kde' KDMRC = '/usr/share/config/kdm/kdmrc' -LDSOPRELOAD = '/etc/ld.so.preload' LILOCONF = '/etc/lilo.conf' LOGINDEFS = '/etc/login.defs' MENULST = '/boot/grub/menu.lst' @@ -722,8 +721,6 @@ class MSEC: self.configfiles.add_config_assoc(SYSLOGCONF, '[ -f /var/lock/subsys/syslog ] && service syslog reload') self.configfiles.add_config_assoc('^/etc/issue$', '/usr/bin/killall mingetty') - # TODO: add a common function to check parameters - def reset(self): """Resets the configuration""" self.log.debug("Resetting msec data.") @@ -1103,7 +1100,7 @@ class MSEC: 'PermitRootLogin without-password', 1) def enable_pam_wheel_for_su(self, arg): - ''' Allow only users in whell grup to su to root.''' + ''' Allow only users in wheel grup to su to root.''' su = self.configfiles.get_config_file(SU) val = su.get_match('^auth\s+required\s+(?:/lib/security/)?pam_wheel.so\s+use_uid\s*$') @@ -1423,7 +1420,6 @@ class MSEC: self.log.info(_('Disabling sulogin in single user runlevel')) inittab.remove_line_matching('~~:S:wait:/sbin/sulogin') - # Do we need this? def enable_msec_cron(self, arg): ''' Perform hourly security check for changes in system configuration.''' mseccron = self.configfiles.get_config_file(MSECCRON) |