xserver: Branch 'master'

[Alan Coopersmith]

 Xext/security.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree b32a40817fc0e2ac2edf2fa22a8813087fce2e7b (from a53586eebc166e35c1f48942205832810061daee)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Jan 24 16:29:49 2007 -0800

    Correct variable descriptions in comment for SecurityCheckResourceIDAccess

diff --git a/Xext/security.c b/Xext/security.c
index 4fbf6f2..bd397a9 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -946,10 +946,10 @@ SecurityAuditResourceIDAccess(
  *	rtype is its type or class.
  *	access_mode represents the intended use of the resource; see
  *	  resource.h.
- *	rval is a pointer to the resource structure for this resource.
+ *	res is a pointer to the resource structure for this resource.
  *
  * Returns:
- *	If access is granted, the value of rval that was passed in, else NULL.
+ *	If access is granted, the value of rval that was passed in, else FALSE.
  *
  * Side Effects:
  *	Disallowed resource accesses are audited.