[X2Go-Commits] nx-libs.git - build-main (branch) updated: nxauth/3.2.0-1

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:21:57 CEST 2013


The branch, build-main has been updated
       via  76b9f2d9104af9ee21a71ae7351deb89558390b6 (commit)
      from  9610c1e727c1f1b09a1289df8d37f393dd043993 (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:
 nx-X11/programs/nxauth/CHANGELOG |    8 ++++++++
 nx-X11/programs/nxauth/process.c |   14 ++++++++++++++
 2 files changed, 22 insertions(+)

The diff of changes is:
diff --git a/nx-X11/programs/nxauth/CHANGELOG b/nx-X11/programs/nxauth/CHANGELOG
index c2eb70c..3cc7dbb 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 bbf59eb..d656386 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;


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)).




More information about the x2go-commits mailing list