nx-libs.git - build-baikal (branch) updated: nxcomp/3.4.0-7 - x2go-commits

30 Aug 2013

The branch, build-baikal has been updated
       via  7c9e193ae57974a27af73f05115532f8d3887502 (commit)
      from  477961678194817aaf1aaf3602f1c91d288a539d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 nxcomp/CHANGELOG |    5 +++++
 nxcomp/Loop.cpp  |    9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

The diff of changes is:

diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index bedb2cc..8899712 100644
--- a/nxcomp/CHANGELOG
+++ b/nxcomp/CHANGELOG
@@ -1,5 +1,10 @@
 ChangeLog:
 
+nxcomp-3.4.0-7
+
+- Fixed TR03H02334. Modified the UNIX domain socket checks on MacOSX
+  to be compliant with the standard introduced in OSX 10.6.3.
+
 nxcomp-3.4.0-6
 
 - Solved compilation problems on Solaris.
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index d5f5d03..92b6fc2 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4261,6 +4261,13 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     if (useLaunchdSocket == 1)
     {
+      char *slash = rindex(display, '/');
+
+      if (slash != NULL)
+      {
+        *slash = '\0';
+      }
+
       snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
     }
 
@@ -4301,7 +4308,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
 
     if (useLaunchdSocket == 1)
     {
-      sprintf(unixSocketName, "%s:%d", unixSocketDir, xPort);
+      strncpy(unixSocketName, displayHost, DEFAULT_STRING_LENGTH - 1);
     }
 
     #endif


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).

    