mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
dix: replace XACE_SERVER_ACCESS by direct callback
Move the callbacks directly into DIX, since it's actually core infrastructure. Also simplifying the whole machinery, by just using a simpel CallbackListPtr. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
bd41233e47
commit
6168868906
@@ -92,6 +92,7 @@ SOFTWARE.
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "dix/server_priv.h"
|
||||
#include "os/xhostname.h"
|
||||
|
||||
#ifndef WIN32
|
||||
@@ -1262,7 +1263,7 @@ AuthorizedClient(ClientPtr client)
|
||||
return Success;
|
||||
|
||||
/* untrusted clients can't change host access */
|
||||
rc = XaceHookServerAccess(client, DixManageAccess);
|
||||
rc = dixCallServerAccessCallback(client, DixManageAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
|
||||
@@ -92,6 +92,7 @@ SOFTWARE.
|
||||
#endif /* WIN32 */
|
||||
|
||||
#include "dix/dix_priv.h"
|
||||
#include "dix/server_priv.h"
|
||||
#include "os/audit.h"
|
||||
#include "os/auth.h"
|
||||
#include "os/client_priv.h"
|
||||
@@ -871,7 +872,7 @@ OnlyListenToOneClient(ClientPtr client)
|
||||
{
|
||||
int rc;
|
||||
|
||||
rc = XaceHookServerAccess(client, DixGrabAccess);
|
||||
rc = dixCallServerAccessCallback(client, DixGrabAccess);
|
||||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user