hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-01 22:03:09 +00:00
Code Issues Projects Releases Wiki Activity

xace: add hooks + new access codes: core protocol server requests

Browse source
This commit is contained in:
Eamon Walsh 2007-08-15 14:14:45 -04:00 • committed by Eamon Walsh
commit 568ae737d1
7 changed files with 62 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dix/dixfonts.c
View file

@ -65,6 +65,7 @@ Equipment Corporation.
#include "dixfontstr.h"
#include "closestr.h"
#include "dixfont.h"
#include "xace.h"
#ifdef DEBUG
#include <stdio.h>
@ -833,6 +834,10 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
if (length > XLFDMAXFONTNAMELEN)
return BadAlloc;
i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
if (i != Success)
return i;
if (!(c = (LFclosurePtr) xalloc(sizeof *c)))
return BadAlloc;
c->fpe_list = (FontPathElementPtr *)
@ -1105,6 +1110,10 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern,
if (length > XLFDMAXFONTNAMELEN)
return BadAlloc;
i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
if (i != Success)
return i;
if (!(c = (LFWIclosurePtr) xalloc(sizeof *c)))
goto badAlloc;
c->fpe_list = (FontPathElementPtr *)
@ -1771,7 +1780,9 @@ bail:
int
SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error)
{
int err = Success;
int err = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess);
if (err != Success)
return err;
if (npaths == 0) {
if (SetDefaultFontPath(defaultFontPath) != Success)
@ -1823,14 +1834,18 @@ SetDefaultFontPath(char *path)
return err;
}
unsigned char *
GetFontPath(int *count, int *length)
int
GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
{
int i;
unsigned char *c;
int len;
FontPathElementPtr fpe;
i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
if (i != Success)
return i;
len = 0;
for (i = 0; i < num_fpes; i++) {
fpe = font_path_elements[i];
@ -1838,7 +1853,7 @@ GetFontPath(int *count, int *length)
}
font_path_string = (unsigned char *) xrealloc(font_path_string, len);
if (!font_path_string)
return NULL;
return BadAlloc;
c = font_path_string;
*length = 0;
@ -1850,7 +1865,8 @@ GetFontPath(int *count, int *length)
c += fpe->name_length;
}
*count = num_fpes;
return font_path_string;
*result = font_path_string;
return Success;
}
_X_EXPORT int