From db7feaf9883bb0dc419593588036405ef12ebca1 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 28 Mar 2013 08:58:35 +0100 Subject: Revert "release 3.5.0.19" This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095. --- nxcomp/Auth.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'nxcomp/Auth.cpp') diff --git a/nxcomp/Auth.cpp b/nxcomp/Auth.cpp index c52392a51..d8e999132 100644 --- a/nxcomp/Auth.cpp +++ b/nxcomp/Auth.cpp @@ -217,31 +217,22 @@ int Auth::getCookie() // // Use the nxauth command on Windows and the Mac, xauth - // 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 + // 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 // other platforms we use the default xauth command that // is in our path. // char command[DEFAULT_STRING_LIMIT]; - #if defined(__CYGWIN32__) + #if defined(__CYGWIN32__) || defined(__APPLE__) 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"); -- cgit v1.2.3