aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Auth.cpp
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-02-09 15:45:33 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:45:33 +0100
commite736fff09871bbbc6101f3da444afbccd473a915 (patch)
tree36454dba29a15ae0ee0aba92c83762bd824773a8 /nxcomp/Auth.cpp
parent9054786947b2f6b82078f6e5f965c3b0b629c880 (diff)
downloadnx-libs-e736fff09871bbbc6101f3da444afbccd473a915.tar.gz
nx-libs-e736fff09871bbbc6101f3da444afbccd473a915.tar.bz2
nx-libs-e736fff09871bbbc6101f3da444afbccd473a915.zip
Fix nxauth location on Mac OS X 10 (052_nxcomp_macos10-nxauth-location.full+lite.patch)
Diffstat (limited to 'nxcomp/Auth.cpp')
-rw-r--r--nxcomp/Auth.cpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp
index d8e999132..c52392a51 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/Auth.cpp
@@ -217,22 +217,31 @@ int Auth::getCookie()
//
// Use the nxauth command on Windows and the Mac, xauth
- // on all the other platforms. On Windows and on the Mac
- // we assume that the nxauth command is located under
- // bin in the client installation directory. On all the
+ // on all the other platforms. On Windows we assume that
+ // the nxauth command is located under bin in the client
+ // installation directory. On Mac OS X we assume that the
+ // command is located directly in the client installation
+ // directory, to make bundle shipping easier. On all the
// other platforms we use the default xauth command that
// is in our path.
//
char command[DEFAULT_STRING_LIMIT];
- #if defined(__CYGWIN32__) || defined(__APPLE__)
+ #if defined(__CYGWIN32__)
snprintf(command, DEFAULT_STRING_LIMIT - 1,
"%s/bin/nxauth", control -> SystemPath);
*(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+ #elif defined(__APPLE__)
+
+ snprintf(command, DEFAULT_STRING_LIMIT - 1,
+ "%s/nxauth", control -> SystemPath);
+
+ *(command + DEFAULT_STRING_LIMIT - 1) = '\0';
+
#else
strcpy(command, "xauth");