diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-12 19:11:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-12 19:11:20 +0000 |
| commit | 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (patch) | |
| tree | db87caaf48c192096c00798d3f18cf458605f4a0 /xorg-server/xkb/ddxLoad.c | |
| parent | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff) | |
| download | vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.tar.gz vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.tar.bz2 vcxsrv-0c5e1ab504b4e8c56974a234bd440e9fa2f1f941.zip | |
Updated to:
font-util-1.1.1
xorg-server-1.7.0.901
Diffstat (limited to 'xorg-server/xkb/ddxLoad.c')
| -rw-r--r-- | xorg-server/xkb/ddxLoad.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index 6954dd150..ba8d50b19 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/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 |