diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 12:37:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-30 12:37:04 +0200 |
| commit | 314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c (patch) | |
| tree | 4ca541c9c14b9b015e5f12227e784a7a418d8d9a /nx-X11/programs/Xserver/xkb/xkbInit.c | |
| parent | e18eb77f397b72c1a10141d2bafa2dc975ab7d38 (diff) | |
| parent | 8f3b446b1336d2c54690468c062c3098df96ba96 (diff) | |
| download | nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.tar.gz nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.tar.bz2 nx-libs-314ec41b8e26ba6d161f0a47d08ce5f239d9bb1c.zip | |
Merge branch 'uli42-pr/various10' into 3.6.x
Attribute GH PR #1075: https://github.com/ArcticaProject/nx-libs/pull/1075
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbInit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index f37e202d8..63686506e 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -834,12 +834,10 @@ XkbProcessArguments(int argc,char *argv[],int i) } else if (strncmp(argv[i], "-xkbdir", 7) == 0) { if(++i < argc) { -#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != geteuid()) { LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n"); return -1; } else -#endif { if (strlen(argv[i]) < PATH_MAX) { XkbBaseDirectory= argv[i]; |