aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/CHANGELOG5
-rw-r--r--nxcomp/Loop.cpp9
2 files changed, 13 insertions, 1 deletions
diff --git a/nxcomp/CHANGELOG b/nxcomp/CHANGELOG
index bedb2ccbf..889971269 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 d5f5d0338..92b6fc28f 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