xserver: Branch 'master'

[Adam Jackson]

 os/log.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6d8ea5104cf97dbf64612f58fc06f94f869ed5ec
Author: Colin Guthrie <cguthrie at mandriva.org>
Date:   Tue Dec 16 17:44:27 2008 -0500

    Fix compilation with -Werror=format-security

diff --git a/os/log.c b/os/log.c
index 351090c..b01965a 100644
--- a/os/log.c
+++ b/os/log.c
@@ -572,9 +572,10 @@ Error(char *str)
 	    return;
 	sprintf(err, "%s: ", str);
 	strcat(err, strerror(saveErrno));
-	LogWrite(-1, err);
+	LogWrite(-1, "%s", err);
+	free(err);
     } else
-	LogWrite(-1, strerror(saveErrno));
+	LogWrite(-1, "%s", strerror(saveErrno));
 }
 
 void