frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XACE: Push the dix "structure" includes down to the security modules.

This commit is contained in:
Eamon Walsh 2008-02-05 21:06:05 -05:00 committed by Eamon Walsh
parent bb1a577a68
commit 5c30327275
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/security.c
View File

@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
#endif #endif
#include "scrnintstr.h" #include "scrnintstr.h"
#include "inputstr.h"
#include "windowstr.h"
#include "propertyst.h"
#include "colormapst.h" #include "colormapst.h"
#include "privates.h" #include "privates.h"
#include "registry.h" #include "registry.h"

4
Xext/xace.c
View File

@ -23,6 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdarg.h> #include <stdarg.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "extnsionst.h"
#include "pixmapstr.h"
#include "regionstr.h"
#include "gcstruct.h"
#include "xacestr.h" #include "xacestr.h"
CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0}; CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};

8
Xext/xace.h
View File

@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_MAJOR_VERSION 2 #define XACE_MAJOR_VERSION 2
#define XACE_MINOR_VERSION 0 #define XACE_MINOR_VERSION 0
#include "pixmap.h" /* for DrawablePtr */ #include "pixmap.h"
#include "regionstr.h" /* for RegionPtr */ #include "region.h"
#include "window.h" /* for WindowPtr */ #include "window.h"
#include "property.h" /* for PropertyPtr */ #include "property.h"
/* Default window background */ /* Default window background */
#define XaceBackgroundNoneState None #define XaceBackgroundNoneState None

9
Xext/xacestr.h
View File

@ -20,13 +20,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _XACESTR_H #ifndef _XACESTR_H
#define _XACESTR_H #define _XACESTR_H
#include "dixstruct.h" #include "dix.h"
#include "resource.h" #include "resource.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "gcstruct.h" #include "window.h"
#include "windowstr.h" #include "input.h"
#include "inputstr.h" #include "property.h"
#include "propertyst.h"
#include "selection.h" #include "selection.h"
#include "xace.h" #include "xace.h"

17
Xext/xselinux.c
View File

@ -22,21 +22,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* All rights reserved. * All rights reserved.
*/ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <sys/socket.h>
#include <stdio.h>
#include <stdarg.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <selinux/label.h> #include <selinux/label.h>
#include <selinux/avc.h> #include <selinux/avc.h>
#include <libaudit.h> #include <libaudit.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "resource.h" #include "resource.h"
#include "privates.h" #include "privates.h"
#include "registry.h" #include "registry.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "inputstr.h"
#include "windowstr.h"
#include "propertyst.h"
#include "extnsionst.h" #include "extnsionst.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "selection.h" #include "selection.h"
@ -46,8 +53,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define TRANS_SERVER #define TRANS_SERVER
#include <X11/Xtrans/Xtrans.h> #include <X11/Xtrans/Xtrans.h>
#include "../os/osdep.h" #include "../os/osdep.h"
#include <stdio.h>
#include <stdarg.h>
#include "modinit.h" #include "modinit.h"