From 09cf02b0457f774bd10574c0facf1df29fb83b53 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Tue, 25 Nov 2003 19:29:03 +0000 Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks --- parsedpy.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'parsedpy.c') diff --git a/parsedpy.c b/parsedpy.c index a2362e1..bdd32c3 100644 --- a/parsedpy.c +++ b/parsedpy.c @@ -29,7 +29,7 @@ in this Software without prior written authorization from The Open Group. * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.6 2001/12/14 20:01:15 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.8 2003/07/18 15:53:28 tsi Exp $ */ #include /* for NULL */ #include /* for isascii() and isdigit() */ @@ -111,10 +111,10 @@ parse_displayname (char *displayname, if (!displayname || !displayname[0]) return False; /* must have at least :number */ - ptr = strchr(displayname, ':'); + ptr = strrchr(displayname, ':'); if (!ptr || !ptr[1]) return False; - if (ptr[1] == ':') { - if (ptr[2] == '\0') return False; + if ((ptr != displayname) && (*(ptr - 1) == ':')) { + ptr--; dnet = True; } @@ -137,6 +137,10 @@ parse_displayname (char *displayname, family = FamilyInternet; } #endif + } else if (!dnet && (*displayname == '[') && (*(ptr - 1) == ']')) { + /* Allow RFC2732-like []:display syntax */ + family = FamilyInternet6; + host = copystring (displayname + 1, len - 2); } else { host = copystring (displayname, len); if (dnet) { -- cgit v1.2.1