summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Giraldeau <francis.giraldeau@revolutionlinux.com>2008-12-17 07:49:39 (GMT)
committerTimo Aaltonen <tjaalton@cc.hut.fi>2008-12-17 07:49:39 (GMT)
commitd61e902aab92c262e6c8ee9cd70aec4493cf6cae (patch)
tree7dd12e464ceaf44e7a9d3544e6d3a2d2ea337caa
parent295a3fa721ee2f2226891de308c0c4b0ee26fe72 (diff)
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.
-rw-r--r--os/connection.c4
1 files changed, 1 insertions, 3 deletions
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