summaryrefslogtreecommitdiff
path: root/dix/dispatch.c
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2007-11-14 13:35:50 -0500
committerEamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil>2007-11-14 13:35:50 -0500
commit1603130236c55ddabc3854d4ba62d544debcf1f5 (patch)
tree02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /dix/dispatch.c
parentf207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff)
parentf7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff)
Merge branch 'master' into XACE-SELINUX
Conflicts: Xext/xace.c Xext/xace.h
Diffstat (limited to 'dix/dispatch.c')
-rw-r--r--dix/dispatch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 19d02fd0c..f7196fde7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -471,9 +471,9 @@ Dispatch(void)
if (result > (maxBigRequestSize << 2))
result = BadLength;
else {
- XaceHook(XACE_AUDIT_BEGIN, client);
+ XaceHookAuditBegin(client);
result = (* client->requestVector[MAJOROP])(client);
- XaceHook(XACE_AUDIT_END, client, result);
+ XaceHookAuditEnd(client, result);
}
#ifdef XSERVER_DTRACE
XSERVER_REQUEST_DONE(GetRequestName(MAJOROP), MAJOROP,