xserver: Branch 'server-1.5-branch'

[Alan Coopersmith]

 xkb/ddxLoad.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce1f6de2e8d5473a8d6995638a7289fdc8f6dc4b
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue May 13 16:39:30 2008 -0700

    When XKB fails to open rules file, log the file name, not the NULL file pointer
    (cherry picked from 7cdc19b29d93bf15cecfd6b69e269fab2501bca0 commit)

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 1fb0979..842c146 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -401,7 +401,7 @@ XkbRF_RulesPtr	rules;
 
     file = fopen(buf, "r");
     if (!file) {
-        LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", file);
+        LogMessage(X_ERROR, "XKB: Couldn't open rules file %s\n", buf);
 	return False;
     }