aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/access.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-02-16 10:51:40 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-21 10:58:07 +0100
commited52cb2952bebf6b98e187ff1f8609690fae3d59 (patch)
tree7be946e2a847094fbc00ccbb99995c3270388497 /nx-X11/programs/Xserver/os/access.c
parent349b6dec54eaa86b49f3627939c4e7039e3b25f0 (diff)
downloadnx-libs-ed52cb2952bebf6b98e187ff1f8609690fae3d59.tar.gz
nx-libs-ed52cb2952bebf6b98e187ff1f8609690fae3d59.tar.bz2
nx-libs-ed52cb2952bebf6b98e187ff1f8609690fae3d59.zip
dix: Pull client-is-local flag up to the ClientRec
Backported from X.org commit ff8e3ad8074cd2c8bed49b39c40c2b4892118270 Author: Adam Jackson <ajax@redhat.com> Date: Thu Sep 20 13:16:59 2012 -0400 dix: Pull client-is-local flag up to the ClientRec Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Adam Jackson <ajax@redhat.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/access.c')
-rw-r--r--nx-X11/programs/Xserver/os/access.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index e9d5d8ae8..d8d035ade 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -1264,13 +1264,6 @@ ComputeLocalClient(ClientPtr client)
return FALSE;
}
-Bool LocalClient(ClientPtr client)
-{
- if (!client->osPrivate)
- return FALSE;
- return ((OsCommPtr)client->osPrivate)->local_client;
-}
-
/*
* Return the uid and gid of a connected local client
*
@@ -1419,7 +1412,7 @@ AuthorizedClient(ClientPtr client)
{
if (!client || defeatAccessControl)
return TRUE;
- return LocalClient(client);
+ return client->local ? Success : BadAccess;
}
/* Add a host to the access control list. This is the external interface