aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:53 +0100
commit7c9e193ae57974a27af73f05115532f8d3887502 (patch)
treeba16e9be929b565d89763ba58b37fe5fb288a963
parent477961678194817aaf1aaf3602f1c91d288a539d (diff)
downloadnx-libs-7c9e193ae57974a27af73f05115532f8d3887502.tar.gz
nx-libs-7c9e193ae57974a27af73f05115532f8d3887502.tar.bz2
nx-libs-7c9e193ae57974a27af73f05115532f8d3887502.zip
Imported nxcomp-3.4.0-7.tar.gznxcomp/3.4.0-7
Summary: Imported nxcomp-3.4.0-7.tar.gz Keywords: Imported nxcomp-3.4.0-7.tar.gz into Git repository
-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