xserver: Branch 'XACE-SELINUX'

[Eamon Walsh]

 dix/main.c       |    6 +++---
 hw/dmx/dmxfont.c |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
diff-tree 7e9e01a4a34fa45521067d43c5bbff942dd5d51a (from 59cebcd2e9302d15a52588ecafbbc2d2c5ae3a6c)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Wed Oct 10 17:40:22 2007 -0400

    dix: pass a valid ClientPtr to SetFontPath in all cases.

diff --git a/dix/main.c b/dix/main.c
index 03e0013..119828b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -388,9 +388,9 @@ main(int argc, char *argv[], char *envp[
 	    FatalError("failed to initialize core devices");
 
 	InitFonts();
-	if (loadableFonts) {
-	    SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error);
-	}
+	if (loadableFonts)
+	    SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath,
+			&error);
         else {
 	    if (SetDefaultFontPath(defaultFontPath) != Success)
 		ErrorF("failed to set default font path '%s'",
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index e5f8635..b70f7d2 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -361,7 +361,8 @@ Bool dmxBELoadFont(ScreenPtr pScreen, Fo
 		}
 	    }
 
-	    if (SetFontPath(NULL, newnpaths, (unsigned char *)newfp, &error)) {
+	    if (SetFontPath(serverClient, newnpaths, (unsigned char *)newfp,
+			    &error)) {
 		/* Note that this should never happen since all of the
 		 * FPEs were previously valid. */
 		dmxLog(dmxError, "Cannot reset the default font path.\n");