diff options
| author | Frederic Lepied <flepied@mandriva.com> | 2003-11-18 08:46:01 +0000 |
|---|---|---|
| committer | Frederic Lepied <flepied@mandriva.com> | 2003-11-18 08:46:01 +0000 |
| commit | 87f6db6d549e24c96bd7a19de03bed23a86c713f (patch) | |
| tree | d4f739b2014058a9977783c08c3a7a6fcd56fae9 | |
| parent | d8dbd1b7d2f9b13b1ea6cc94cb9db491f18d3189 (diff) | |
| download | msec-87f6db6d549e24c96bd7a19de03bed23a86c713f.tar msec-87f6db6d549e24c96bd7a19de03bed23a86c713f.tar.gz msec-87f6db6d549e24c96bd7a19de03bed23a86c713f.tar.bz2 msec-87f6db6d549e24c96bd7a19de03bed23a86c713f.tar.xz msec-87f6db6d549e24c96bd7a19de03bed23a86c713f.zip | |
allow_xserver_to_listen: corrected startx modifications (Gavin Porter)
| -rw-r--r-- | share/libmsec.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/libmsec.py b/share/libmsec.py index 373847f..17d8a00 100644 --- a/share/libmsec.py +++ b/share/libmsec.py @@ -72,7 +72,7 @@ SHADOW = '/etc/shadow' SHUTDOWN = '/etc/security/console.apps/shutdown' SHUTDOWNALLOW = '/etc/shutdown.allow' SSHDCONFIG = '/etc/ssh/sshd_config' -STARTX = '/usr/X11R6/bin/startx ' +STARTX = '/usr/X11R6/bin/startx' SU = '/etc/pam.d/su' SYSCTLCONF = '/etc/sysctl.conf' SYSLOGCONF = '/etc/syslog.conf' @@ -274,7 +274,7 @@ allow_x_connections.one_arg = 1 ################################################################################ -STARTX_REGEXP = '(\s*clientargs=".*) -nolisten tcp(.*")' +STARTX_REGEXP = '(\s*serverargs=".*) -nolisten tcp(.*")' XSERVERS_REGEXP = '(\s*[^#]+/usr/X11R6/bin/X .*) -nolisten tcp(.*)' GDMCONF_REGEXP = '(\s*command=.*/X.*?) -nolisten tcp(.*)$' def allow_xserver_to_listen(arg): @@ -306,7 +306,7 @@ to the X server on the tcp port 6000 or not.''' else: if not val_startx or not val_xservers or not val_gdmconf: _interactive and log(_('Forbidding the X server to listen to tcp connection')) - startx.exists() and startx.replace_line_matching('clientargs="(.*?)( -nolisten tcp)?"', 'clientargs="@1 -nolisten tcp"') + startx.exists() and startx.replace_line_matching('serverargs="(.*?)( -nolisten tcp)?"', 'serverargs="@1 -nolisten tcp"') xservers.exists() and xservers.replace_line_matching('(\s*[^#]+/usr/X11R6/bin/X .*?)( -nolisten tcp)?$', '@1 -nolisten tcp', 0, 1) gdmconf.exists() and gdmconf. replace_line_matching('(\s*command=.*/X.*?)( -nolisten tcp)?$', '@1 -nolisten tcp', 0, 1) |