diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-05-20 12:43:59 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-07-29 09:52:04 -0400 |
| commit | 578026fcd58d12dd0be4c0976ee5ecf95a9d61f0 (patch) | |
| tree | 1379812fa87e82a15ce579e711baeb51e7358126 | |
| parent | cad9b053d52f62432dfd70e42e0240de77027cae (diff) | |
os: Remove LocalClientCred
The comment lies, shm hasn't used this code since:
commit fdef7be5c8d5989e0aa453d0a5b86d0a6952e960
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 9 18:44:04 2007 -0700
Sun bug 6589829: include zoneid of shm segment in access [...]
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | include/os.h | 3 | ||||
| -rw-r--r-- | os/access.c | 27 |
2 files changed, 0 insertions, 30 deletions
diff --git a/include/os.h b/include/os.h index 9982c9bb7..e4ec4b1b8 100644 --- a/include/os.h +++ b/include/os.h @@ -380,9 +380,6 @@ typedef struct sockaddr *sockaddrPtr; extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr */ , int /*len */ , ClientPtr client); -extern _X_EXPORT int -LocalClientCred(ClientPtr, int *, int *); - #define LCC_UID_SET (1 << 0) #define LCC_GID_SET (1 << 1) #define LCC_PID_SET (1 << 2) diff --git a/os/access.c b/os/access.c index 9fcf99a73..125f35f5f 100644 --- a/os/access.c +++ b/os/access.c @@ -1008,33 +1008,6 @@ ComputeLocalClient(ClientPtr client) } /* - * Return the uid and gid of a connected local client - * - * Used by XShm to test access rights to shared memory segments - */ -int -LocalClientCred(ClientPtr client, int *pUid, int *pGid) -{ - LocalClientCredRec *lcc; - int ret = GetLocalClientCreds(client, &lcc); - - if (ret == 0) { -#ifdef HAVE_GETZONEID /* only local if in the same zone */ - if ((lcc->fieldsSet & LCC_ZID_SET) && (lcc->zoneid != getzoneid())) { - FreeLocalClientCreds(lcc); - return -1; - } -#endif - if ((lcc->fieldsSet & LCC_UID_SET) && (pUid != NULL)) - *pUid = lcc->euid; - if ((lcc->fieldsSet & LCC_GID_SET) && (pGid != NULL)) - *pGid = lcc->egid; - FreeLocalClientCreds(lcc); - } - return ret; -} - -/* * Return the uid and all gids of a connected local client * Allocates a LocalClientCredRec - caller must call FreeLocalClientCreds * |