xserver: Branch 'master'

[Timo Aaltonen]

 os/connection.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d61e902aab92c262e6c8ee9cd70aec4493cf6cae
Author: Francis Giraldeau <francis.giraldeau at revolutionlinux.com>
Date:   Wed Dec 17 09:49:39 2008 +0200

    Don't log audit messages when -audit 0 specified
    
    make the auditTrailLevel check more general and don't log when not
    using DTRACE and -audit 0 is set.

diff --git a/os/connection.c b/os/connection.c
index ed3ecab..aa25938 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -602,8 +602,8 @@ AuthAudit (ClientPtr client, Bool letin,
     
 #ifdef XSERVER_DTRACE
     XSERVER_CLIENT_AUTH(client->index, addr, client_pid, client_zid);
-    if (auditTrailLevel > 1) {
 #endif
+    if (auditTrailLevel > 1) {
       if (proto_n)
 	AuditF("client %d %s from %s%s\n  Auth name: %.*s ID: %d\n", 
 	       client->index, letin ? "connected" : "rejected", addr,
@@ -613,9 +613,7 @@ AuthAudit (ClientPtr client, Bool letin,
 	       client->index, letin ? "connected" : "rejected", addr,
 	       client_uid_string);
 
-#ifdef XSERVER_DTRACE
     }
-#endif	
 }
 
 XID