diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-06-17 13:22:41 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2012-01-06 13:29:53 -0500 |
| commit | 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96 (patch) | |
| tree | d09673dd9ccdb88cb48174c2612b2d12787bf1af /os | |
| parent | f702372822dadb1fef92cfc25086481f640147b3 (diff) | |
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>
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 9 | ||||
| -rw-r--r-- | os/connection.c | 2 | ||||
| -rw-r--r-- | os/osdep.h | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/os/access.c b/os/access.c index b609442de..ed13d0a0d 100644 --- a/os/access.c +++ b/os/access.c @@ -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 diff --git a/os/connection.c b/os/connection.c index 8a677a7ef..575cfb80f 100644 --- a/os/connection.c +++ b/os/connection.c @@ -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 diff --git a/os/osdep.h b/os/osdep.h index 5fe019f5f..60cef27a2 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -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( |