diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-01 20:48:15 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-12-01 21:15:41 -0500 |
| commit | f44f14fe564d834568a0afefba944223a73ea0f5 (patch) | |
| tree | bfa5eced6d2aa797c34c86aab8926be289f263c1 /os/access.c | |
| parent | a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c (diff) | |
Define calls away when not building XACE, allowing ifdef's to be removed.
Diffstat (limited to 'os/access.c')
| -rw-r--r-- | os/access.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/os/access.c b/os/access.c index cdb17589c..d61edeffc 100644 --- a/os/access.c +++ b/os/access.c @@ -202,9 +202,7 @@ SOFTWARE. #include "dixstruct.h" #include "osdep.h" -#ifdef XACE #include "xace.h" -#endif #ifndef PATH_MAX #ifdef MAXPATHLEN @@ -1528,11 +1526,11 @@ AuthorizedClient(ClientPtr client) { if (!client || defeatAccessControl) return TRUE; -#ifdef XACE + /* untrusted clients can't change host access */ if (!XaceHook(XACE_HOSTLIST_ACCESS, client, SecurityWriteAccess)) return FALSE; -#endif + return LocalClient(client); } |