summaryrefslogtreecommitdiff
path: root/Xext/xace.h
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 /Xext/xace.h
parentf207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff)
parentf7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff)
Merge branch 'master' into XACE-SELINUX
Conflicts: Xext/xace.c Xext/xace.h
Diffstat (limited to 'Xext/xace.h')
-rw-r--r--Xext/xace.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/Xext/xace.h b/Xext/xace.h
index fc96458a9..de0e8fe81 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -63,6 +63,11 @@ extern int XaceHook(
... /*appropriate args for hook*/
);
+/* Special-cased hook functions
+ */
+extern void XaceHookAuditEnd(ClientPtr ptr, int result);
+extern void XaceHookAuditBegin(ClientPtr ptr);
+
/* Register a callback for a given hook.
*/
#define XaceRegisterCallback(hook,callback,data) \
@@ -93,9 +98,13 @@ extern void XaceCensorImage(
#ifdef __GNUC__
#define XaceHook(args...) Success
+#define XaceHookAuditEnd(args...) { ; }
+#define XaceHookAuditBegin(args...) { ; }
#define XaceCensorImage(args...) { ; }
#else
#define XaceHook(...) Success
+#define XaceHookAuditEnd(...) { ; }
+#define XaceHookAuditBegin(...) { ; }
#define XaceCensorImage(...) { ; }
#endif