Commit 7c9e193a authored by Reinhard Tartler's avatar Reinhard Tartler

Imported nxcomp-3.4.0-7.tar.gz

Summary: Imported nxcomp-3.4.0-7.tar.gz Keywords: Imported nxcomp-3.4.0-7.tar.gz into Git repository
parent 47796167
ChangeLog: 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 nxcomp-3.4.0-6
- Solved compilation problems on Solaris. - Solved compilation problems on Solaris.
......
...@@ -4261,6 +4261,13 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr, ...@@ -4261,6 +4261,13 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
if (useLaunchdSocket == 1) if (useLaunchdSocket == 1)
{ {
char *slash = rindex(display, '/');
if (slash != NULL)
{
*slash = '\0';
}
snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display); snprintf(unixSocketDir, DEFAULT_STRING_LENGTH - 1, "%s", display);
} }
...@@ -4301,7 +4308,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr, ...@@ -4301,7 +4308,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
if (useLaunchdSocket == 1) if (useLaunchdSocket == 1)
{ {
sprintf(unixSocketName, "%s:%d", unixSocketDir, xPort); strncpy(unixSocketName, displayHost, DEFAULT_STRING_LENGTH - 1);
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment