remove DECnet support

just as Xorg upstream did

1 files changed, 13 insertions, 29 deletions

diff --git a/nx-X11/lib/X11/ConnDis.c b/nx-X11/lib/X11/ConnDis.c
index 46b71b23f..5d6f85aa7 100644
--- a/nx-X11/lib/X11/ConnDis.c
+++ b/nx-X11/lib/X11/ConnDis.c
@@ -145,14 +145,15 @@ static char *copystring (const char *src, int len)
  *
  *     [protocol/] [hostname] : [:] displaynumber [.screennumber]
  *
- * A string with exactly two colons seperating hostname from the display
- * indicates a DECnet style name.  Colons in the hostname may occur if an
- * IPv6 numeric address is used as the hostname.  An IPv6 numeric address
- * may also end in a double colon, so three colons in a row indicates an
- * IPv6 address ending in :: followed by :display.  To make it easier for
- * people to read, an IPv6 numeric address hostname may be surrounded by
- * [ ] in a similar fashion to the IPv6 numeric address URL syntax defined
- * by IETF RFC 2732.
+ * A string with exactly two colons seperating hostname from the
+ * display indicates a (now unsupported) DECnet style name.  Colons in
+ * the hostname may occur if an IPv6 numeric address is used as the
+ * hostname.  An IPv6 numeric address may also end in a double colon,
+ * so three colons in a row indicates an IPv6 address ending in ::
+ * followed by :display.  To make it easier for people to read, an
+ * IPv6 numeric address hostname may be surrounded by [ ] in a similar
+ * fashion to the IPv6 numeric address URL syntax defined by IETF RFC
+ * 2732.
  *
  * If no hostname and no protocol is specified, the string is interpreted
  * as the most efficient local connection to a server on the same machine.
@@ -188,7 +189,6 @@ _X11TransConnectDisplay (
     char *phostname = NULL;		/* start of host of display */
     char *pdpynum = NULL;		/* start of dpynum of display */
     char *pscrnum = NULL;		/* start of screen of display */
-    Bool dnet = False;			/* if true, then DECnet format */
     int idisplay = 0;			/* required display number */
     int iscreen = 0;			/* optional screen number */
     /*  int (*connfunc)(); */		/* method to create connection */
@@ -318,6 +318,7 @@ _X11TransConnectDisplay (
      * or two colons in the case of DECnet (DECnet Phase V allows a single
      * colon in the hostname).  (See note above regarding IPv6 numeric
      * addresses with triple colons or [] brackets.)
+     * FIXME: we do not support DECnet anymore, so maybe remove these checks?
      */
 
     lastp = p;
@@ -335,16 +336,7 @@ _X11TransConnectDisplay (
 	) {
 	/* DECnet display specified */
 
-#ifndef DNETCONN
 	goto bad;
-#else
-	dnet = True;
-	/* override the protocol specified */
-	if (pprotocol)
-	    Xfree (pprotocol);
-	pprotocol = copystring ("dnet", 4);
-	hostlen = lastc - 1 - lastp;
-#endif
     }
     else
 	hostlen = lastc - lastp;
@@ -482,7 +474,6 @@ _X11TransConnectDisplay (
      *     phostname                hostname string or NULL
      *     idisplay                 display number
      *     iscreen                  screen number
-     *     dnet                     DECnet boolean
      *
      * We can now decide which transport to use based on the ConnectionFlags
      * build parameter the hostname string.  If phostname is NULL or equals
@@ -654,7 +645,7 @@ _X11TransConnectDisplay (
 	original_hostname = NULL;
     }
 #endif
-    len = ((phostname ? strlen(phostname) : 0) + 1 + (dnet ? 1 : 0) +
+    len = ((phostname ? strlen(phostname) : 0) + 1 +
 	   strlen(pdpynum) + 1 + (pscrnum ? strlen(pscrnum) : 1) + 1);
     *fullnamep = (char *) Xmalloc (len);
     if (!*fullnamep) goto bad;
@@ -663,13 +654,13 @@ _X11TransConnectDisplay (
     if (phostname && strlen(phostname) > 11 && !strncmp(phostname, "/tmp/launch", 11))
 	sprintf (*fullnamep, "%s%s%d",
 	     (phostname ? phostname : ""),
-	     (dnet ? "::" : ":"),
+	     ":",
 	     idisplay);
     else
 #endif
     sprintf (*fullnamep, "%s%s%d.%d",
 	     (phostname ? phostname : ""),
-	     (dnet ? "::" : ":"),
+	     ":",
 	     idisplay, iscreen);
 
     *dpynump = idisplay;
@@ -1419,13 +1410,6 @@ GetAuthorization(
 	    break;
 	  }
 #endif /* AF_UNIX */
-#ifdef AF_DECnet
-	case AF_DECnet:
-	    /*
-	     * What is the defined encoding for this?
-	     */
-	    break;
-#endif /* AF_DECnet */
 	default:
 	    /*
 	     * Need to return some kind of errro status here.