aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:51:57 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:51:57 +0200
commit76b9f2d9104af9ee21a71ae7351deb89558390b6 (patch)
treeff3a81a8ccd4638b6c23a1d6f4c72d70a203f18c
parent9610c1e727c1f1b09a1289df8d37f393dd043993 (diff)
downloadnx-libs-nxauth/3.2.0-1.tar.gz
nx-libs-nxauth/3.2.0-1.tar.bz2
nx-libs-nxauth/3.2.0-1.zip
Imported nxauth-3.2.0-1.tar.gznxauth/3.2.0-1
Summary: Imported nxauth-3.2.0-1.tar.gz Keywords: Imported nxauth-3.2.0-1.tar.gz into Git repository
-rw-r--r--nx-X11/programs/nxauth/CHANGELOG8
-rw-r--r--nx-X11/programs/nxauth/process.c14
2 files changed, 22 insertions, 0 deletions
diff --git a/nx-X11/programs/nxauth/CHANGELOG b/nx-X11/programs/nxauth/CHANGELOG
index c2eb70c4f..3cc7dbb6e 100644
--- a/nx-X11/programs/nxauth/CHANGELOG
+++ b/nx-X11/programs/nxauth/CHANGELOG
@@ -1,5 +1,13 @@
ChangeLog:
+nxauth-3.2.0-1
+
+- Opened the 3.2.0 branch based on nxauth-3.1.0-2.
+
+nxauth-3.1.0-2
+
+- Added support for launchd socket.
+
nxauth-3.1.0-1
- Opened the 3.1.0 branch based on nxauth-3.0.0-6.
diff --git a/nx-X11/programs/nxauth/process.c b/nx-X11/programs/nxauth/process.c
index bbf59eb7a..d65638697 100644
--- a/nx-X11/programs/nxauth/process.c
+++ b/nx-X11/programs/nxauth/process.c
@@ -503,6 +503,20 @@ get_displayname_auth(char *displayname, Xauth *auth)
if (cp && strncmp (cp, "/unix:", 6) == 0)
prelen = (cp - displayname);
+ #ifdef __APPLE__
+
+ /*
+ * FIXME: This is an attempt to get the right
+ * cookie, because no one can grant that the
+ * X server is running on the display number
+ * reported in the launchd display name.
+ */
+
+ if (strncmp (displayname, "/tmp/launch", 11) == 0)
+ displayname = strrchr(displayname, '/') + 1;
+
+ #endif
+
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {
return False;