diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-02-09 15:45:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 15:45:33 +0100 |
| commit | e736fff09871bbbc6101f3da444afbccd473a915 (patch) | |
| tree | 36454dba29a15ae0ee0aba92c83762bd824773a8 | |
| parent | 9054786947b2f6b82078f6e5f965c3b0b629c880 (diff) | |
| download | nx-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)
| -rw-r--r-- | debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | nxcomp/Auth.cpp | 17 |
3 files changed, 13 insertions, 46 deletions
diff --git a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch b/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch deleted file mode 100644 index 813363e69..000000000 --- a/debian/patches/052_nxcomp_macos10-nxauth-location.full+lite.patch +++ /dev/null @@ -1,41 +0,0 @@ -Description: Fix nxauth location on Mac OS X 10 -Author: Mihai Moldovan <ionic@ionic.de> - ---- a/nxcomp/Auth.cpp -+++ b/nxcomp/Auth.cpp -@@ -217,22 +217,31 @@ - - // - // 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"); diff --git a/debian/patches/series b/debian/patches/series index 214bf6a69..138d87ae9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -052_nxcomp_macos10-nxauth-location.full+lite.patch 053_nx-X11_no-xcomp1-install-target.full.patch 054_nx-X11_ppc64-ftbfs.full.patch 055_nx-X11_imake-Werror-format-security.full.patch 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"); |