summaryrefslogtreecommitdiff
path: root/include/dixstruct.h
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-05 20:04:52 +0000
committerAlan Coopersmith <alanc@alf.(none)>2006-06-19 17:09:37 -0700
commit37f0ae02457bd22b27f8f30a373e5cb19f2fbaea (patch)
tree94127e7ba8d70ead4ee3a0c47e56e965d0a7c685 /include/dixstruct.h
parent8d9ccc90a54c786ca4ba5620ab0a965e3f3bc8ea (diff)
Replace XC-SECURITY code with XACE security hooks
(cherry picked from 8526cd6395490b03b279f1962df777fb0e4a9878 commit)
Diffstat (limited to 'include/dixstruct.h')
-rw-r--r--include/dixstruct.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h
index f38a64d07..1ac7d84b6 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -130,15 +130,8 @@ typedef struct _Client {
int requestLogIndex;
#endif
unsigned long replyBytesRemaining;
-#ifdef XCSECURITY
- XID authId;
- unsigned int trustLevel;
- pointer (* CheckAccess)(
- ClientPtr /*pClient*/,
- XID /*id*/,
- RESTYPE /*classes*/,
- Mask /*access_mode*/,
- pointer /*resourceval*/);
+#ifdef XACE
+ pointer securityState[4]; /* 4 slots for use */
#endif
#ifdef XAPPGROUP
struct _AppGroupRec* appgroup;