Checking just for root is insufficient since that does not guarantee write/read permissions in XKM_OUTPUT_DIR (for example with sandbox).
Check if we can write a file, as well as read it later. Otherwise, invoke the fallback to /tmp Signed-off-by: Nirbheek Chauhan <[email protected]> --- xkb/ddxLoad.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 6954dd1..ba8d50b 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -158,10 +158,9 @@ OutputDirectory( size_t size) { #ifndef WIN32 - if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size)) + /* Can we write an xkm and then open it too? */ + if (access(XKM_OUTPUT_DIR, W_OK | X_OK) == 0 && (strlen(XKM_OUTPUT_DIR) < size)) { - /* if server running as root it *may* be able to write */ - /* FIXME: check whether directory is writable at all */ (void) strcpy (outdir, XKM_OUTPUT_DIR); } else #else -- 1.6.5.rc1 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
