summaryrefslogtreecommitdiff
path: root/os/connection.c
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2006-12-01 20:48:15 -0500
committerEamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>2006-12-01 21:15:41 -0500
commitf44f14fe564d834568a0afefba944223a73ea0f5 (patch)
treebfa5eced6d2aa797c34c86aab8926be289f263c1 /os/connection.c
parenta5d6499d666fea4a9988118ddd3a5e4c9cfcc32c (diff)
Define calls away when not building XACE, allowing ifdef's to be removed.
Diffstat (limited to 'os/connection.c')
-rw-r--r--os/connection.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/os/connection.c b/os/connection.c
index 100f1e522..ffe911e45 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -148,9 +148,7 @@ extern __const__ int _nfiles;
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
-#ifdef XACE
#include "xace.h"
-#endif
#ifdef XCSECURITY
#include "securitysrv.h"
#endif
@@ -750,9 +748,9 @@ ClientAuthorized(ClientPtr client,
/* indicate to Xdmcp protocol that we've opened new client */
XdmcpOpenDisplay(priv->fd);
#endif /* XDMCP */
-#ifdef XACE
+
XaceHook(XACE_AUTH_AVAIL, client, auth_id);
-#endif
+
/* At this point, if the client is authorized to change the access control
* list, we should getpeername() information, and add the client to
* the selfhosts list. It's not really the host machine, but the