xserver: Branch 'XACE-SELINUX' - 2 commits

[Eamon Walsh]

 dix/resource.c      |    2 +-
 include/dixaccess.h |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
diff-tree 793470a8356976ddd427280a738dfb6e1c0e4e70 (from ddb26bccd275f4fc011f7a2be685d1ce58555a00)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Jun 4 12:33:49 2007 -0400

    dix: fix null pointer dereference in new resource lookup function.

diff --git a/dix/resource.c b/dix/resource.c
index 67124c7..e89ad1f 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -908,7 +908,6 @@ dixLookupResource(pointer *result, XID i
     ResourcePtr res = NULL;
 
     *result = NULL;
-    client->errorValue = id;
 
     if ((cid < MAXCLIENTS) && clientTable[cid].buckets) {
 	res = clientTable[cid].resources[Hash(cid, id)];
@@ -922,6 +921,7 @@ dixLookupResource(pointer *result, XID i
 	return BadValue;
 
     if (client) {
+	client->errorValue = id;
 	cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
 		       mode, res->value);
 	if (cid != Success)
diff-tree ddb26bccd275f4fc011f7a2be685d1ce58555a00 (from 2a4aa63a23ddd816b647b851a01865861827a7eb)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu May 24 12:20:24 2007 -0400

    dix: Add a bunch of new access codes.
    
    These were determined through an analysis of the core protocol and 35 of
    the most common protocol extensions.  There remain four bits for future
    use.

diff --git a/include/dixaccess.h b/include/dixaccess.h
index 205b76c..3c62ee3 100644
--- a/include/dixaccess.h
+++ b/include/dixaccess.h
@@ -25,5 +25,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #define DixWriteAccess		(1<<1)	/* changing the object */
 #define DixDestroyAccess	(1<<2)	/* destroying the object */
 #define DixCreateAccess		(1<<3)	/* creating the object */
+#define DixGetAttrAccess	(1<<4)	/* get object attributes */
+#define DixSetAttrAccess	(1<<5)	/* set object attributes */
+#define DixListPropAccess	(1<<6)  /* list properties of object */
+#define DixGetPropAccess	(1<<7)	/* get properties of object */
+#define DixSetPropAccess	(1<<8)	/* set properties of object */
+#define DixGetFocusAccess	(1<<9)	/* get focus of object */
+#define DixSetFocusAccess	(1<<10)	/* set focus of object */
+#define DixListAccess		(1<<11)	/* list objects */
+#define DixAddAccess		(1<<12)	/* add object */
+#define DixRemoveAccess		(1<<13)	/* remove object */
+#define DixHideAccess		(1<<14)	/* hide object */
+#define DixShowAccess		(1<<15)	/* show object */
+#define DixBlendAccess		(1<<16)	/* mix contents of objects */
+#define DixGrabAccess		(1<<17)	/* exclusive access to object */
+#define DixFreezeAccess		(1<<18)	/* freeze status of object */
+#define DixForceAccess		(1<<19)	/* force status of object */
+#define DixInstallAccess	(1<<20)	/* install object */
+#define DixUninstallAccess	(1<<21)	/* uninstall object */
+#define DixSendAccess		(1<<22)	/* send to object */
+#define DixReceiveAccess	(1<<23)	/* receive from object */
+#define DixUseAccess		(1<<24)	/* use object */
+#define DixManageAccess		(1<<25)	/* manage object */
+#define DixDebugAccess		(1<<26)	/* debug object */
+#define DixBellAccess		(1<<27)	/* audible sound */
 
 #endif /* DIX_ACCESS_H */