xserver: Branch 'master'

[Alan Coopersmith]

 os/connection.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree 9725516b4274ceaf9d6caf372c5439b4c9db2316 (from edb9ccf3ecb4e35a840aa13815979c5fbd73f32d)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Jun 22 17:05:21 2007 -0700

    Split checks for dtrace & getpeerucred()

diff --git a/os/connection.c b/os/connection.c
index cb3443c..693bb20 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -171,8 +171,10 @@ extern __const__ int _nfiles;
 #ifdef XSERVER_DTRACE
 # include <sys/types.h>
 typedef const char *string;
+# ifndef HAS_GETPEERUCRED
+#  define zoneid_t int
+# endif
 # include "../dix/Xserver-dtrace.h"
-# include <ucred.h>
 #endif
 
 static int lastfdesc;		/* maximum file descriptor */
@@ -563,6 +565,8 @@ AuthAudit (ClientPtr client, Bool letin,
     char client_uid_string[64];
 #ifdef HAS_GETPEERUCRED
     ucred_t *peercred = NULL;
+#endif
+#if defined(HAS_GETPEERUCRED) || defined(XSERVER_DTRACE)    
     pid_t client_pid = -1;
     zoneid_t client_zid = -1;
 #endif