diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-02 19:53:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-02 19:53:35 +0000 |
| commit | 6f25a23db1df27e992c34f6fd4c82e83c44fc2e2 (patch) | |
| tree | a49e113cbab862b959559a047afef689df50e492 /xorg-server/Xext/xselinux.c | |
| parent | 78b8aacf420184834a24f11d138b88c2f3ed09d1 (diff) | |
| download | vcxsrv-6f25a23db1df27e992c34f6fd4c82e83c44fc2e2.tar.gz vcxsrv-6f25a23db1df27e992c34f6fd4c82e83c44fc2e2.tar.bz2 vcxsrv-6f25a23db1df27e992c34f6fd4c82e83c44fc2e2.zip | |
Switched to xorg-server-1.6.3.901.tar.gz
Diffstat (limited to 'xorg-server/Xext/xselinux.c')
| -rw-r--r-- | xorg-server/Xext/xselinux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/Xext/xselinux.c b/xorg-server/Xext/xselinux.c index 6c99c2944..3124eb9b7 100644 --- a/xorg-server/Xext/xselinux.c +++ b/xorg-server/Xext/xselinux.c @@ -557,7 +557,7 @@ SELinuxLabelInitial(void) SELinuxScreen(NULL, NULL, &srec); /* Do the default colormap */ - dixLookupResource(&unused, screenInfo.screens[i]->defColormap, + dixLookupResourceByType(&unused, screenInfo.screens[i]->defColormap, RT_COLORMAP, serverClient, DixCreateAccess); } } @@ -1989,6 +1989,10 @@ SELinuxExtensionInit(INITARGS) return; } + /* Don't init unless there's something to do */ + if (!security_get_boolean_active("xserver_object_manager")) + return; + /* Check SELinux mode in configuration file */ switch(selinuxEnforcingState) { case SELINUX_MODE_DISABLED: |