aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/perm.01
-rw-r--r--conf/perm.11
-rw-r--r--conf/perm.21
-rw-r--r--conf/perm.31
-rw-r--r--conf/perm.41
-rw-r--r--conf/perm.51
-rwxr-xr-xmsec.csh4
-rw-r--r--share/libmsec.py14
8 files changed, 7 insertions, 17 deletions
diff --git a/conf/perm.0 b/conf/perm.0
index 9bee0cc..e786706 100644
--- a/conf/perm.0
+++ b/conf/perm.0
@@ -60,7 +60,6 @@
/tmp/ root.root 777
/usr/ root.root 755
/usr/* root.root 755
-/usr/X11R6/ root.root 755
/usr/bin/ root.root 755
/usr/bin/cc root.root 755
/usr/bin/finger root.root 755
diff --git a/conf/perm.1 b/conf/perm.1
index b9b57ca..ddeaa3c 100644
--- a/conf/perm.1
+++ b/conf/perm.1
@@ -62,7 +62,6 @@
/tmp/ root.root 1777
/usr/ root.root 755
/usr/* root.root 755
-/usr/X11R6/ root.root 755
/usr/bin/ root.root 755
/usr/bin/cc root.root 755
/usr/bin/finger root.root 755
diff --git a/conf/perm.2 b/conf/perm.2
index 11c65ff..a65fd4f 100644
--- a/conf/perm.2
+++ b/conf/perm.2
@@ -63,7 +63,6 @@
/tmp/ root.root 1777
/usr/ root.root 755
/usr/* root.root 755
-/usr/X11R6/ root.root 755
/usr/bin/ root.root 755
/usr/bin/cc root.root 755
/usr/bin/finger root.root 755
diff --git a/conf/perm.3 b/conf/perm.3
index 1e447f4..85df279 100644
--- a/conf/perm.3
+++ b/conf/perm.3
@@ -63,7 +63,6 @@
/tmp/ root.root 1777
/usr/ root.root 755
/usr/* root.root 755
-/usr/X11R6/ root.root 755
/usr/bin/ root.root 755
/usr/bin/cc root.root 755
/usr/bin/finger root.root 755
diff --git a/conf/perm.4 b/conf/perm.4
index ef6199c..b8848bf 100644
--- a/conf/perm.4
+++ b/conf/perm.4
@@ -63,7 +63,6 @@
/tmp/ root.adm 1773
/usr/ root.adm 751
/usr/* root.adm 751
-/usr/X11R6/ root.xgrp 751
/usr/bin/ root.adm 751
/usr/bin/cc root.ctools 750
/usr/bin/finger root.ntools 750
diff --git a/conf/perm.5 b/conf/perm.5
index 3b07b61..8aedfc8 100644
--- a/conf/perm.5
+++ b/conf/perm.5
@@ -63,7 +63,6 @@
/tmp/ root.root 1733
/usr/ root.root 711
/usr/* root.root 711
-/usr/X11R6/ root.xgrp 710
/usr/bin/ root.root 711
/usr/bin/cc root.ctools 750
/usr/bin/finger root.ntools 750
diff --git a/msec.csh b/msec.csh
index 71d9ec5..362f51d 100755
--- a/msec.csh
+++ b/msec.csh
@@ -32,10 +32,6 @@ endif
# using unhash *after modifying PATH* fixes the pb
# So while modifying the PATH, do not rely on the PATH until unhash is done
-if ! { (echo "${PATH}" | /bin/grep -q /usr/X11R6/bin) } then
- setenv PATH "${PATH}:/usr/X11R6/bin"
-endif
-
if ! { (echo "${PATH}" | /bin/grep -q /usr/games) } then
setenv PATH "${PATH}:/usr/games"
endif
diff --git a/share/libmsec.py b/share/libmsec.py
index 10742fd..e4f1adb 100644
--- a/share/libmsec.py
+++ b/share/libmsec.py
@@ -74,7 +74,7 @@ SHUTDOWN = '/usr/bin/shutdown'
SHUTDOWNALLOW = '/etc/shutdown.allow'
SIMPLE_ROOT_AUTHEN = '/etc/pam.d/simple_root_authen'
SSHDCONFIG = '/etc/ssh/sshd_config'
-STARTX = '/usr/X11R6/bin/startx'
+STARTX = '/usr/bin/startx'
SU = '/etc/pam.d/su'
SYSCTLCONF = '/etc/sysctl.conf'
SYSLOGCONF = '/etc/syslog.conf'
@@ -236,7 +236,7 @@ local connection) and NONE (no connection).'''
msec = ConfigFile.get_config_file(MSEC_XINIT)
- val = msec.exists() and msec.get_match('/usr/X11R6/bin/xhost\s*\+\s*([^#]*)')
+ val = msec.exists() and msec.get_match('/usr/bin/xhost\s*\+\s*([^#]*)')
if val:
if val == '':
@@ -256,17 +256,17 @@ local connection) and NONE (no connection).'''
if arg == ALL:
if val != arg:
_interactive and log(_('Allowing users to connect X server from everywhere'))
- msec.exists() and msec.replace_line_matching('/usr/X11R6/bin/xhost', '/usr/X11R6/bin/xhost +', 1)
+ msec.exists() and msec.replace_line_matching('/usr/bin/xhost', '/usr/bin/xhost +', 1)
elif arg == LOCAL:
if val != arg:
_interactive and log(_('Allowing users to connect X server from localhost'))
- msec.exists() and msec.replace_line_matching('/usr/X11R6/bin/xhost', '/usr/X11R6/bin/xhost + localhost', 1)
+ msec.exists() and msec.replace_line_matching('/usr/bin/xhost', '/usr/bin/xhost + localhost', 1)
elif arg == NONE:
if val != arg:
_interactive and log(_('Restricting X server connection to the console user'))
- msec.exists() and msec.remove_line_matching('/usr/X11R6/bin/xhost', 1)
+ msec.exists() and msec.remove_line_matching('/usr/bin/xhost', 1)
else:
error(_('invalid allow_x_connections arg: %s') % arg)
@@ -278,7 +278,7 @@ allow_x_connections.one_arg = 1
################################################################################
STARTX_REGEXP = '(\s*serverargs=".*) -nolisten tcp(.*")'
-XSERVERS_REGEXP = '(\s*[^#]+/usr/X11R6/bin/X .*) -nolisten tcp(.*)'
+XSERVERS_REGEXP = '(\s*[^#]+/usr/bin/X .*) -nolisten tcp(.*)'
GDMCONF_REGEXP = '(\s*command=.*/X.*?) -nolisten tcp(.*)$'
KDMRC_REGEXP = re.compile('(.*?)-nolisten tcp(.*)$')
@@ -321,7 +321,7 @@ to the X server on the tcp port 6000 or not.'''
if not val_startx or not val_xservers or not val_gdmconf or not val_kdmrc:
_interactive and log(_('Forbidding the X server to listen to tcp connection'))
startx.exists() and not val_startx and startx.replace_line_matching('serverargs="(.*?)( -nolisten tcp)?"', 'serverargs="@1 -nolisten tcp"')
- xservers.exists() and not val_xservers and xservers.replace_line_matching('(\s*[^#]+/usr/X11R6/bin/X .*?)( -nolisten tcp)?$', '@1 -nolisten tcp', 0, 1)
+ xservers.exists() and not val_xservers and xservers.replace_line_matching('(\s*[^#]+/usr/bin/X .*?)( -nolisten tcp)?$', '@1 -nolisten tcp', 0, 1)
gdmconf.exists() and not val_gdmconf and gdmconf.replace_line_matching('(\s*command=.*/X.*?)( -nolisten tcp)?$', '@1 -nolisten tcp', 0, 1)
kdmrc.exists() and not val_kdmrc and kdmrc.replace_line_matching('^(ServerArgsLocal=.*)( -nolisten tcp)?$', '@1 -nolisten tcp', 'ServerArgsLocal=-nolisten tcp', 0, 'X-\*-Core', '^\s*$')