mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 16:44:52 +00:00
f333cac5c2
Removing the namespace assignment of killed clients in ClientState-hook is too early - we still need it later. Using the new ClientDestroyCallback instead. Closes: https://github.com/X11Libre/xserver/issues/486 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
56 lines
1.5 KiB
C
56 lines
1.5 KiB
C
#define HOOK_NAME "clienstate"
|
|
|
|
#include <dix-config.h>
|
|
|
|
#include "dix/registry_priv.h"
|
|
#include "os/client_priv.h"
|
|
#include "os/auth.h"
|
|
|
|
#include "namespace.h"
|
|
#include "hooks.h"
|
|
|
|
void hookClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
|
|
{
|
|
XNS_HOOK_HEAD(NewClientInfoRec);
|
|
|
|
switch (client->clientState) {
|
|
case ClientStateInitial:
|
|
// better assign *someting* than null -- clients can't do anything yet anyways
|
|
XnamespaceAssignClient(subj, &ns_anon);
|
|
break;
|
|
|
|
case ClientStateRunning:
|
|
subj->authId = AuthorizationIDOfClient(client);
|
|
|
|
short unsigned int name_len = 0, data_len = 0;
|
|
const char * name = NULL;
|
|
char * data = NULL;
|
|
if (AuthorizationFromID(subj->authId, &name_len, &name, &data_len, &data)) {
|
|
XnamespaceAssignClient(subj, XnsFindByAuth(name_len, name, data_len, data));
|
|
} else {
|
|
XNS_HOOK_LOG("no auth data - assuming anon\n");
|
|
}
|
|
break;
|
|
|
|
case ClientStateRetained:
|
|
break;
|
|
case ClientStateGone:
|
|
break;
|
|
default:
|
|
XNS_HOOK_LOG("unknown state =%d\n", client->clientState);
|
|
break;
|
|
}
|
|
}
|
|
|
|
void hookClientDestroy(CallbackListPtr *pcbl, void *unused, void *calldata)
|
|
{
|
|
ClientPtr client = calldata;
|
|
struct XnamespaceClientPriv *subj = XnsClientPriv(client);
|
|
|
|
if (!subj)
|
|
return; /* no XNS devprivate assigned ? */
|
|
|
|
XnamespaceAssignClient(subj, NULL);
|
|
/* the devprivate is embedded, so no free() necessary */
|
|
}
|