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>
This commit is contained in:
parent
f702372822
commit
49d38b75c8
|
@ -300,7 +300,7 @@ ProcXF86BigfontQueryVersion(
|
|||
#endif
|
||||
reply.capabilities =
|
||||
#ifdef HAS_SHM
|
||||
(LocalClient(client) && !client->swapped ? XF86Bigfont_CAP_LocalShm : 0)
|
||||
(client->local && !client->swapped ? XF86Bigfont_CAP_LocalShm : 0)
|
||||
#else
|
||||
0
|
||||
#endif
|
||||
|
@ -367,7 +367,7 @@ ProcXF86BigfontQueryFont(
|
|||
#else
|
||||
switch (client->req_len) {
|
||||
case 2: /* client with version 1.0 libX11 */
|
||||
stuff_flags = (LocalClient(client) && !client->swapped ? XF86Bigfont_FLAGS_Shm : 0);
|
||||
stuff_flags = (client->local && !client->swapped ? XF86Bigfont_FLAGS_Shm : 0);
|
||||
break;
|
||||
case 3: /* client with version 1.1 libX11 */
|
||||
stuff_flags = stuff->flags;
|
||||
|
|
|
@ -586,7 +586,7 @@ ProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client)
|
|||
}
|
||||
rep.isCapable = isCapable;
|
||||
|
||||
if (!LocalClient(client) || client->swapped)
|
||||
if (!client->local || client->swapped)
|
||||
rep.isCapable = 0;
|
||||
|
||||
if (client->swapped) {
|
||||
|
@ -1253,7 +1253,7 @@ ProcXF86DRIDispatch (register ClientPtr client)
|
|||
}
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return DRIErrorBase + XF86DRIClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
|
|
|
@ -928,7 +928,7 @@ ProcXDGADispatch (ClientPtr client)
|
|||
{
|
||||
REQUEST(xReq);
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return DGAErrorBase + XF86DGAClientNotLocal;
|
||||
|
||||
#ifdef DGA_REQ_DEBUG
|
||||
|
|
|
@ -1527,7 +1527,7 @@ ProcXF86VidModeGetPermissions(ClientPtr client)
|
|||
rep.sequenceNumber = client->sequence;
|
||||
rep.permissions = XF86VM_READ_PERMISSION;
|
||||
if (xf86GetVidModeEnabled() &&
|
||||
(xf86GetVidModeAllowNonLocal() || LocalClient (client))) {
|
||||
(xf86GetVidModeAllowNonLocal() || client->local)) {
|
||||
rep.permissions |= XF86VM_WRITE_PERMISSION;
|
||||
}
|
||||
if(client->swapped) {
|
||||
|
@ -1597,7 +1597,7 @@ ProcXF86VidModeDispatch(ClientPtr client)
|
|||
default:
|
||||
if (!xf86GetVidModeEnabled())
|
||||
return VidModeErrorBase + XF86VidModeExtensionDisabled;
|
||||
if (xf86GetVidModeAllowNonLocal() || LocalClient (client)) {
|
||||
if (xf86GetVidModeAllowNonLocal() || client->local) {
|
||||
switch (stuff->data) {
|
||||
case X_XF86VidModeAddModeLine:
|
||||
return ProcXF86VidModeAddModeLine(client);
|
||||
|
@ -2017,7 +2017,7 @@ SProcXF86VidModeDispatch(ClientPtr client)
|
|||
default:
|
||||
if (!xf86GetVidModeEnabled())
|
||||
return VidModeErrorBase + XF86VidModeExtensionDisabled;
|
||||
if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
|
||||
if (xf86GetVidModeAllowNonLocal() || client->local) {
|
||||
switch (stuff->data) {
|
||||
case X_XF86VidModeAddModeLine:
|
||||
return SProcXF86VidModeAddModeLine(client);
|
||||
|
|
|
@ -130,7 +130,7 @@ ProcXF86DRIQueryDirectRenderingCapable(
|
|||
}
|
||||
rep.isCapable = isCapable;
|
||||
|
||||
if (!LocalClient(client) || client->swapped)
|
||||
if (!client->local || client->swapped)
|
||||
rep.isCapable = 0;
|
||||
|
||||
if (client->swapped) {
|
||||
|
@ -557,7 +557,7 @@ ProcXF86DRIDispatch (
|
|||
return ProcXF86DRIQueryDirectRenderingCapable(client);
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return DRIErrorBase + XF86DRIClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
|
|
|
@ -547,7 +547,7 @@ ProcDRI2Dispatch (ClientPtr client)
|
|||
return ProcDRI2QueryVersion(client);
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return BadRequest;
|
||||
|
||||
switch (stuff->data) {
|
||||
|
|
|
@ -630,7 +630,7 @@ ProcAppleWMDispatch (
|
|||
return ProcAppleWMQueryVersion(client);
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return WMErrorBase + AppleWMClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
|
@ -693,7 +693,7 @@ SProcAppleWMDispatch (
|
|||
REQUEST(xReq);
|
||||
|
||||
/* It is bound to be non-local when there is byte swapping */
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return WMErrorBase + AppleWMClientNotLocal;
|
||||
|
||||
/* only local clients are allowed WM access */
|
||||
|
|
|
@ -133,7 +133,7 @@ ProcAppleDRIQueryDirectRenderingCapable(
|
|||
}
|
||||
rep.isCapable = isCapable;
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
rep.isCapable = 0;
|
||||
|
||||
if (client->swapped) {
|
||||
|
@ -365,7 +365,7 @@ ProcAppleDRIDispatch (
|
|||
return ProcAppleDRIQueryDirectRenderingCapable(client);
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return DRIErrorBase + AppleDRIClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
|
|
|
@ -548,7 +548,7 @@ ProcWindowsWMDispatch (ClientPtr client)
|
|||
return ProcWindowsWMQueryVersion(client);
|
||||
}
|
||||
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return WMErrorBase + WindowsWMClientNotLocal;
|
||||
|
||||
switch (stuff->data)
|
||||
|
@ -598,7 +598,7 @@ SProcWindowsWMDispatch (ClientPtr client)
|
|||
REQUEST(xReq);
|
||||
|
||||
/* It is bound to be non-local when there is byte swapping */
|
||||
if (!LocalClient(client))
|
||||
if (!client->local)
|
||||
return WMErrorBase + WindowsWMClientNotLocal;
|
||||
|
||||
/* only local clients are allowed WM access */
|
||||
|
|
|
@ -91,6 +91,7 @@ typedef struct _Client {
|
|||
pointer requestBuffer;
|
||||
pointer osPrivate; /* for OS layer, including scheduler */
|
||||
char swapped;
|
||||
char local;
|
||||
char big_requests;
|
||||
char closeDownMode;
|
||||
char clientGone;
|
||||
|
|
|
@ -353,8 +353,6 @@ typedef struct sockaddr * sockaddrPtr;
|
|||
|
||||
extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
|
||||
|
||||
extern _X_EXPORT int LocalClient(ClientPtr /* client */);
|
||||
|
||||
extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);
|
||||
|
||||
#define LCC_UID_SET (1 << 0)
|
||||
|
|
|
@ -1045,13 +1045,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
|
||||
*
|
||||
|
@ -1209,7 +1202,7 @@ AuthorizedClient(ClientPtr client)
|
|||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
return LocalClient(client) ? Success : BadAccess;
|
||||
return client->local ? Success : BadAccess;
|
||||
}
|
||||
|
||||
/* Add a host to the access control list. This is the external interface
|
||||
|
|
|
@ -745,7 +745,7 @@ AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time)
|
|||
free(oc);
|
||||
return NullClient;
|
||||
}
|
||||
oc->local_client = ComputeLocalClient(client);
|
||||
client->local = ComputeLocalClient(client);
|
||||
#if !defined(WIN32)
|
||||
ConnectionTranslation[fd] = client->index;
|
||||
#else
|
||||
|
|
|
@ -166,7 +166,6 @@ typedef struct _osComm {
|
|||
XID auth_id; /* authorization id */
|
||||
CARD32 conn_time; /* timestamp if not established, else 0 */
|
||||
struct _XtransConnInfo *trans_conn; /* transport connection object */
|
||||
Bool local_client;
|
||||
} OsCommRec, *OsCommPtr;
|
||||
|
||||
extern int FlushClient(
|
||||
|
|
Loading…
Reference in New Issue
Block a user