diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:51:57 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:51:57 +0200 |
| commit | 76b9f2d9104af9ee21a71ae7351deb89558390b6 (patch) | |
| tree | ff3a81a8ccd4638b6c23a1d6f4c72d70a203f18c /nx-X11/programs/nxauth/process.c | |
| parent | 9610c1e727c1f1b09a1289df8d37f393dd043993 (diff) | |
| download | nx-libs-76b9f2d9104af9ee21a71ae7351deb89558390b6.tar.gz nx-libs-76b9f2d9104af9ee21a71ae7351deb89558390b6.tar.bz2 nx-libs-76b9f2d9104af9ee21a71ae7351deb89558390b6.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
Diffstat (limited to 'nx-X11/programs/nxauth/process.c')
| -rw-r--r-- | nx-X11/programs/nxauth/process.c | 14 |
1 files changed, 14 insertions, 0 deletions
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; |