Merge remote-tracking branch 'origin/master' into obsd

7 files changed, 10 insertions, 631 deletions

diff --git a/Xtrans.c b/Xtrans.c
index d257872..bec5903 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -445,16 +445,6 @@ TRANS(Open) (int type, const char *address)
 	ciptr = thistrans->OpenCOTSServer(thistrans, protocol, host, port);
 #endif /* TRANS_SERVER */
 	break;
-    case XTRANS_OPEN_CLTS_CLIENT:
-#ifdef TRANS_CLIENT
-	ciptr = thistrans->OpenCLTSClient(thistrans, protocol, host, port);
-#endif /* TRANS_CLIENT */
-	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-#ifdef TRANS_SERVER
-	ciptr = thistrans->OpenCLTSServer(thistrans, protocol, host, port);
-#endif /* TRANS_SERVER */
-	break;
     default:
 	prmsg (1,"Open: Unknown Open type %d\n", type);
     }
@@ -533,9 +523,6 @@ TRANS(Reopen) (int type, int trans_id, int fd, const char *port)
     case XTRANS_OPEN_COTS_SERVER:
 	ciptr = thistrans->ReopenCOTSServer(thistrans, fd, port);
 	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-	ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port);
-	break;
     default:
 	prmsg (1,"Reopen: Bad Open type %d\n", type);
     }
@@ -589,32 +576,6 @@ TRANS(OpenCOTSServer) (const char *address)
 #endif /* TRANS_SERVER */
 
 
-#ifdef TRANS_CLIENT
-
-XtransConnInfo
-TRANS(OpenCLTSClient) (const char *address)
-
-{
-    prmsg (2,"OpenCLTSClient(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo
-TRANS(OpenCLTSServer) (const char *address)
-
-{
-    prmsg (2,"OpenCLTSServer(%s)\n", address);
-    return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address);
-}
-
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 XtransConnInfo
@@ -625,15 +586,6 @@ TRANS(ReopenCOTSServer) (int trans_id, int fd, const char *port)
     return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port);
 }
 
-XtransConnInfo
-TRANS(ReopenCLTSServer) (int trans_id, int fd, const char *port)
-
-{
-    prmsg (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port);
-    return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port);
-}
-
-
 int
 TRANS(GetReopenInfo) (XtransConnInfo ciptr,
 		      int *trans_id, int *fd, char **port)
@@ -1015,27 +967,6 @@ TRANS(IsLocal) (XtransConnInfo ciptr)
     return (ciptr->family == AF_UNIX);
 }
 
-
-int
-TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
-		  Xtransaddr **addrp)
-
-{
-    prmsg (2,"GetMyAddr(%d)\n", ciptr->fd);
-
-    *familyp = ciptr->family;
-    *addrlenp = ciptr->addrlen;
-
-    if ((*addrp = malloc (ciptr->addrlen)) == NULL)
-    {
-	prmsg (1,"GetMyAddr: malloc failed\n");
-	return -1;
-    }
-    memcpy(*addrp, ciptr->addr, ciptr->addrlen);
-
-    return 0;
-}
-
 int
 TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
 		    Xtransaddr **addrp)
@@ -1310,104 +1241,6 @@ TRANS(MakeAllCOTSServerListeners) (const char *port, int *partial,
     return 0;
 }
 
-int
-TRANS(MakeAllCLTSServerListeners) (const char *port, int *partial,
-                                   int *count_ret, XtransConnInfo **ciptrs_ret)
-
-{
-    char		buffer[256]; /* ??? What size ?? */
-    XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS];
-    int			status, i, j;
-
-    prmsg (2,"MakeAllCLTSServerListeners(%s,%p)\n",
-	port ? port : "NULL", ciptrs_ret);
-
-    *count_ret = 0;
-
-    for (i = 0; i < NUMTRANS; i++)
-    {
-	Xtransport *trans = Xtransports[i].transport;
-
-	if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN)
-	    continue;
-
-	snprintf(buffer, sizeof(buffer), "%s/:%s",
-		 trans->TransName, port ? port : "");
-
-	prmsg (5,"MakeAllCLTSServerListeners: opening %s\n",
-	    buffer);
-
-	if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL)
-	{
-	    prmsg (1,
-	"MakeAllCLTSServerListeners: failed to open listener for %s\n",
-		  trans->TransName);
-	    continue;
-	}
-
-	if ((status = TRANS(CreateListener (ciptr, port, 0))) < 0)
-	{
-	    if (status == TRANS_ADDR_IN_USE)
-	    {
-		/*
-		 * We failed to bind to the specified address because the
-		 * address is in use.  It must be that a server is already
-		 * running at this address, and this function should fail.
-		 */
-
-		prmsg (1,
-		"MakeAllCLTSServerListeners: server already running\n");
-
-		for (j = 0; j < *count_ret; j++)
-		    TRANS(Close) (temp_ciptrs[j]);
-
-		*count_ret = 0;
-		*ciptrs_ret = NULL;
-		*partial = 0;
-		return -1;
-	    }
-	    else
-	    {
-		prmsg (1,
-	"MakeAllCLTSServerListeners: failed to create listener for %s\n",
-		  trans->TransName);
-
-		continue;
-	    }
-	}
-
-	prmsg (5,
-	"MakeAllCLTSServerListeners: opened listener for %s, %d\n",
-	      trans->TransName, ciptr->fd);
-	temp_ciptrs[*count_ret] = ciptr;
-	(*count_ret)++;
-    }
-
-    *partial = (*count_ret < complete_network_count());
-
-    prmsg (5,
-     "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
-	*partial, *count_ret, complete_network_count());
-
-    if (*count_ret > 0)
-    {
-	if ((*ciptrs_ret = malloc (
-	    *count_ret * sizeof (XtransConnInfo))) == NULL)
-	{
-	    return -1;
-	}
-
-	for (i = 0; i < *count_ret; i++)
-	{
-	    (*ciptrs_ret)[i] = temp_ciptrs[i];
-	}
-    }
-    else
-	*ciptrs_ret = NULL;
-
-    return 0;
-}
-
 #endif /* TRANS_SERVER */
 
 
diff --git a/Xtrans.h b/Xtrans.h
index 22e0440..6760632 100644
--- a/Xtrans.h
+++ b/Xtrans.h
@@ -111,21 +111,6 @@ static const char *__xtransname = "_IceTrans";
 #endif
 #endif /* ICE_t */
 
-#ifdef TEST_t
-#define TRANS(func) _TESTTrans##func
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_TESTTrans";
-#endif
-#endif /* TEST_t */
-
-#ifdef LBXPROXY_t
-#define TRANS(func) _LBXPROXYTrans##func
-#define X11_t		/* The server defines this - so should the LBX proxy */
-#ifdef XTRANSDEBUG
-static const char *__xtransname = "_LBXPROXYTrans";
-#endif
-#endif /* LBXPROXY_t */
-
 #if !defined(TRANS)
 #define TRANS(func) _XTrans##func
 #ifdef XTRANSDEBUG
@@ -230,10 +215,6 @@ typedef struct _XtransConnInfo *XtransConnInfo;
  * Function prototypes for the exposed interface
  */
 
-void TRANS(FreeConnInfo) (
-    XtransConnInfo 	/* ciptr */
-);
-
 #ifdef TRANS_CLIENT
 
 XtransConnInfo TRANS(OpenCOTSClient)(
@@ -250,22 +231,6 @@ XtransConnInfo TRANS(OpenCOTSServer)(
 
 #endif /* TRANS_SERVER */
 
-#ifdef TRANS_CLIENT
-
-XtransConnInfo TRANS(OpenCLTSClient)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-XtransConnInfo TRANS(OpenCLTSServer)(
-    const char *	/* address */
-);
-
-#endif /* TRANS_SERVER */
-
 #ifdef TRANS_REOPEN
 
 XtransConnInfo TRANS(ReopenCOTSServer)(
@@ -274,12 +239,6 @@ XtransConnInfo TRANS(ReopenCOTSServer)(
     const char *	/* port */
 );
 
-XtransConnInfo TRANS(ReopenCLTSServer)(
-    int,		/* trans_id */
-    int,		/* fd */
-    const char *	/* port */
-);
-
 int TRANS(GetReopenInfo)(
     XtransConnInfo,	/* ciptr */
     int *,		/* trans_id */
@@ -389,13 +348,6 @@ int TRANS(IsLocal)(
     XtransConnInfo	/* ciptr */
 );
 
-int TRANS(GetMyAddr)(
-    XtransConnInfo,	/* ciptr */
-    int *,		/* familyp */
-    int *,		/* addrlenp */
-    Xtransaddr **	/* addrp */
-);
-
 int TRANS(GetPeerAddr)(
     XtransConnInfo,	/* ciptr */
     int *,		/* familyp */
@@ -416,13 +368,6 @@ int TRANS(MakeAllCOTSServerListeners)(
     XtransConnInfo **	/* ciptrs_ret */
 );
 
-int TRANS(MakeAllCLTSServerListeners)(
-    const char *,	/* port */
-    int *,		/* partial */
-    int *,		/* count_ret */
-    XtransConnInfo **	/* ciptrs_ret */
-);
-
 #endif /* TRANS_SERVER */
 
 
diff --git a/Xtransint.h b/Xtransint.h
index dd63e27..0a5b0e6 100644
--- a/Xtransint.h
+++ b/Xtransint.h
@@ -151,9 +151,6 @@ struct _XtransConnInfo {
 
 #define XTRANS_OPEN_COTS_CLIENT       1
 #define XTRANS_OPEN_COTS_SERVER       2
-#define XTRANS_OPEN_CLTS_CLIENT       3
-#define XTRANS_OPEN_CLTS_SERVER       4
-
 
 typedef struct _Xtransport {
     const char	*TransName;
@@ -181,29 +178,6 @@ typedef struct _Xtransport {
 
 #endif /* TRANS_SERVER */
 
-#ifdef TRANS_CLIENT
-
-    XtransConnInfo (*OpenCLTSClient)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_CLIENT */
-
-#ifdef TRANS_SERVER
-
-    XtransConnInfo (*OpenCLTSServer)(
-	struct _Xtransport *,	/* transport */
-	const char *,		/* protocol */
-	const char *,		/* host */
-	const char *		/* port */
-    );
-
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
     XtransConnInfo (*ReopenCOTSServer)(
@@ -212,12 +186,6 @@ typedef struct _Xtransport {
         const char *		/* port */
     );
 
-    XtransConnInfo (*ReopenCLTSServer)(
-	struct _Xtransport *,	/* transport */
-        int,			/* fd */
-        const char *		/* port */
-    );
-
 #endif /* TRANS_REOPEN */
 
 
@@ -350,6 +318,10 @@ typedef struct _Xtransport_table {
  * systems, so they may be emulated.
  */
 
+static void TRANS(FreeConnInfo) (
+    XtransConnInfo 	/* ciptr */
+);
+
 #ifdef WIN32
 
 #define READV(ciptr, iov, iovcnt)	TRANS(ReadV)(ciptr, iov, iovcnt)
diff --git a/Xtranslcl.c b/Xtranslcl.c
index a8bbf10..07625e1 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -1848,11 +1848,7 @@ TRANS(LocalOpenClient)(int type, const char *protocol,
 	case XTRANS_OPEN_COTS_CLIENT:
 	    ciptr->fd=transptr->devcotsopenclient(ciptr,port);
 	    break;
-	case XTRANS_OPEN_CLTS_CLIENT:
-	    ciptr->fd=transptr->devcltsopenclient(ciptr,port);
-	    break;
 	case XTRANS_OPEN_COTS_SERVER:
-	case XTRANS_OPEN_CLTS_SERVER:
 	    prmsg(1,
 		  "LocalOpenClient: Should not be opening a server with this function\n");
 	    break;
@@ -1917,16 +1913,12 @@ TRANS(LocalOpenServer)(int type, const char *protocol,
 	switch( type )
 	{
 	case XTRANS_OPEN_COTS_CLIENT:
-	case XTRANS_OPEN_CLTS_CLIENT:
 	    prmsg(1,
 		  "LocalOpenServer: Should not be opening a client with this function\n");
 	    break;
 	case XTRANS_OPEN_COTS_SERVER:
 	    ciptr->fd=LOCALtrans2devtab[i].devcotsopenserver(ciptr,port);
 	    break;
-	case XTRANS_OPEN_CLTS_SERVER:
-	    ciptr->fd=LOCALtrans2devtab[i].devcltsopenserver(ciptr,port);
-	    break;
 	default:
 	    prmsg(1,"LocalOpenServer: Unknown Open type %d\n",
 		  type );
@@ -1971,9 +1963,6 @@ TRANS(LocalReopenServer)(int type, int index, int fd, const char *port)
     case XTRANS_OPEN_COTS_SERVER:
 	stat = LOCALtrans2devtab[index].devcotsreopenserver(ciptr,fd,port);
 	break;
-    case XTRANS_OPEN_CLTS_SERVER:
-	stat = LOCALtrans2devtab[index].devcltsreopenserver(ciptr,fd,port);
-	break;
     default:
 	prmsg(1,"LocalReopenServer: Unknown Open type %d\n",
 	  type );
@@ -2056,37 +2045,6 @@ TRANS(LocalOpenCOTSServer)(Xtransport *thistrans, const char *protocol,
 
 #endif /* TRANS_SERVER */
 
-
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(LocalOpenCLTSClient)(Xtransport *thistrans _X_UNUSED, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    prmsg(2,"LocalOpenCLTSClient(%s,%s,%s)\n",protocol,host,port);
-
-    return TRANS(LocalOpenClient)(XTRANS_OPEN_CLTS_CLIENT, protocol, host, port);
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(LocalOpenCLTSServer)(Xtransport *thistrans _X_UNUSED, const char *protocol,
-			   const char *host, const char *port)
-
-{
-    prmsg(2,"LocalOpenCLTSServer(%s,%s,%s)\n",protocol,host,port);
-
-    return TRANS(LocalOpenServer)(XTRANS_OPEN_CLTS_SERVER, protocol, host, port);
-}
-
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
@@ -2113,30 +2071,6 @@ TRANS(LocalReopenCOTSServer)(Xtransport *thistrans, int fd, const char *port)
 	index, fd, port);
 }
 
-static XtransConnInfo
-TRANS(LocalReopenCLTSServer)(Xtransport *thistrans, int fd, const char *port)
-
-{
-    int index;
-
-    prmsg(2,"LocalReopenCLTSServer(%d,%s)\n", fd, port);
-
-    for(index=1;index<NUMTRANSPORTS;index++)
-    {
-	if( strcmp(thistrans->TransName,
-	    LOCALtrans2devtab[index].transname) == 0 )
-	    break;
-    }
-
-    if (index >= NUMTRANSPORTS)
-    {
-	return (NULL);
-    }
-
-    return TRANS(LocalReopenServer)(XTRANS_OPEN_CLTS_SERVER,
-	index, fd, port);
-}
-
 #endif /* TRANS_REOPEN */
 
 
@@ -2365,15 +2299,8 @@ Xtransport	TRANS(LocalFuncs) = {
 	local_aliases,
 	TRANS(LocalOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
 #endif
 	TRANS(LocalSetOption),
 #ifdef TRANS_SERVER
@@ -2411,15 +2338,8 @@ Xtransport	TRANS(PTSFuncs) = {
 	NULL,
 	TRANS(LocalOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
 #endif
 	TRANS(LocalSetOption),
 #ifdef TRANS_SERVER
@@ -2459,15 +2379,8 @@ Xtransport	TRANS(NAMEDFuncs) = {
 	NULL,
 	TRANS(LocalOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
 #endif
 	TRANS(LocalSetOption),
 #ifdef TRANS_SERVER
@@ -2504,15 +2417,8 @@ Xtransport	TRANS(PIPEFuncs) = {
 	NULL,
 	TRANS(LocalOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
 #endif
 	TRANS(LocalSetOption),
 #ifdef TRANS_SERVER
@@ -2552,15 +2458,8 @@ Xtransport	TRANS(SCOFuncs) = {
 	NULL,
 	TRANS(LocalOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(LocalOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(LocalOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(LocalReopenCOTSServer),
-	TRANS(LocalReopenCLTSServer),
 #endif
 	TRANS(LocalSetOption),
 #ifdef TRANS_SERVER
diff --git a/Xtranssock.c b/Xtranssock.c
index 094f15c..6aabadd 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -215,14 +215,6 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
 #define UNIX_PATH "/tmp/.ICE-unix/"
 #define UNIX_DIR "/tmp/.ICE-unix"
 #endif /* ICE_t */
-#if defined(TEST_t)
-#define UNIX_PATH "/tmp/.Test-unix/test"
-#define UNIX_DIR "/tmp/.Test-unix"
-#endif
-#if defined(LBXPROXY_t)
-#define UNIX_PATH "/tmp/.X11-unix/X"
-#define UNIX_DIR  "/tmp/.X11-unix"
-#endif
 
 
 #endif /* UNIXCONN */
@@ -666,91 +658,6 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, const char *protocol,
 #endif /* TRANS_SERVER */
 
 
-#ifdef TRANS_CLIENT
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int			i = -1;
-
-    prmsg (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		 i, Sockettrans2devtab[i].devcotsname)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCLTSClient: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketOpenCLTSClient: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_CLIENT */
-
-
-#ifdef TRANS_SERVER
-
-static XtransConnInfo
-TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, const char *protocol,
-			     const char *host, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int	i = -1;
-
-    prmsg (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketOpen) (
-		 i, Sockettrans2devtab[i].devcotsname)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketOpenCLTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketOpenCLTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-#ifdef IPV6_V6ONLY
-    if (Sockettrans2devtab[i].family == AF_INET6)
-    {
-	int one = 1;
-	setsockopt(ciptr->fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(int));
-    }
-#endif
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
-#endif /* TRANS_SERVER */
-
-
 #ifdef TRANS_REOPEN
 
 static XtransConnInfo
@@ -787,40 +694,6 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, const char *port)
     return ciptr;
 }
 
-static XtransConnInfo
-TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, const char *port)
-
-{
-    XtransConnInfo	ciptr;
-    int			i = -1;
-
-    prmsg (2,
-	"SocketReopenCLTSServer(%d, %s)\n", fd, port);
-
-    SocketInitOnce();
-
-    while ((i = TRANS(SocketSelectFamily) (i, thistrans->TransName)) >= 0) {
-	if ((ciptr = TRANS(SocketReopen) (
-		 i, Sockettrans2devtab[i].devcotsname, fd, port)) != NULL)
-	    break;
-    }
-    if (i < 0) {
-	if (i == -1)
-	    prmsg (1,"SocketReopenCLTSServer: Unable to open socket for %s\n",
-		   thistrans->TransName);
-	else
-	    prmsg (1,"SocketReopenCLTSServer: Unable to determine socket type for %s\n",
-		   thistrans->TransName);
-	return NULL;
-    }
-
-    /* Save the index for later use */
-
-    ciptr->index = i;
-
-    return ciptr;
-}
-
 #endif /* TRANS_REOPEN */
 
 
@@ -2502,15 +2375,8 @@ Xtransport	TRANS(SocketTCPFuncs) = {
 	tcp_nolisten,
 	TRANS(SocketOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
 #endif
 	TRANS(SocketSetOption),
 #ifdef TRANS_SERVER
@@ -2546,15 +2412,8 @@ Xtransport	TRANS(SocketINETFuncs) = {
 	NULL,
 	TRANS(SocketOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
 #endif
 	TRANS(SocketSetOption),
 #ifdef TRANS_SERVER
@@ -2591,15 +2450,8 @@ Xtransport     TRANS(SocketINET6Funcs) = {
 	NULL,
 	TRANS(SocketOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
 #endif
 	TRANS(SocketSetOption),
 #ifdef TRANS_SERVER
@@ -2643,15 +2495,8 @@ Xtransport	TRANS(SocketLocalFuncs) = {
 	NULL,
 	TRANS(SocketOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
 #endif
 	TRANS(SocketSetOption),
 #ifdef TRANS_SERVER
@@ -2701,15 +2546,8 @@ Xtransport	TRANS(SocketUNIXFuncs) = {
 #endif
 	TRANS(SocketOpenCOTSServer),
 #endif /* TRANS_SERVER */
-#ifdef TRANS_CLIENT
-	TRANS(SocketOpenCLTSClient),
-#endif /* TRANS_CLIENT */
-#ifdef TRANS_SERVER
-	TRANS(SocketOpenCLTSServer),
-#endif /* TRANS_SERVER */
 #ifdef TRANS_REOPEN
 	TRANS(SocketReopenCOTSServer),
-	TRANS(SocketReopenCLTSServer),
 #endif
 	TRANS(SocketSetOption),
 #ifdef TRANS_SERVER
diff --git a/autogen.sh b/autogen.sh
index fc34bd5..84386b5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,6 +9,9 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
+git config --local --get format.subjectPrefix ||
+        git config --local format.subjectPrefix "PATCH libxtrans"
+
 if test -z "$NOCONFIGURE"; then
     $srcdir/configure "$@"
 fi
diff --git a/doc/xtrans.xml b/doc/xtrans.xml
index e3bc1c9..08a3cac 100644
--- a/doc/xtrans.xml
+++ b/doc/xtrans.xml
@@ -204,20 +204,6 @@ typedef struct _Xtransport {
      const char *             /* port */
     );
 
-    XtransConnInfo (*OpenCLTSClient)(
-     struct _Xtransport *,    /* transport */
-     const char *,            /* protocol */
-     const char *,            /* host */
-     const char *             /* port */
-    );
-
-    XtransConnInfo (*OpenCLTSServer)(
-     struct _Xtransport *,    /* transport */
-     const char *,            /* protocol */
-     const char *,            /* host */
-     const char *             /* port */
-    );
-
     int     (*SetOption)(
      XtransConnInfo,          /* connection */
      int,               /* option */
@@ -420,36 +406,6 @@ on failure.
     </para>
   </listitem>
   <listitem>
-    <funcsynopsis id='TRANSOpenCLTSClient'>
-      <funcprototype>
-        <funcdef>XtransConnInfo <function>TRANS(OpenCLTSClient)</function></funcdef>
-        <paramdef>const char *<parameter>address</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <para>
-This function creates a Connection-Less Transport that is suitable for
-use by a client. The parameter <parameter>address</parameter> contains the
-full address of the server to which this endpoint will be connected. This
-function returns an opaque transport connection object on success, or
-<constant>NULL</constant> on failure.
-    </para>
-  </listitem>
-  <listitem>
-    <funcsynopsis id='TRANSOpenCLTSServer'>
-      <funcprototype>
-        <funcdef>XtransConnInfo <function>TRANS(OpenCLTSServer)</function></funcdef>
-        <paramdef>const char *<parameter>address</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <para>
-This function creates a Connection-Less Transport that is suitable for
-use by a server. The parameter <parameter>address</parameter> contains the
-full address to which this server will be bound. This function returns an
-opaque transport connection object on success, or <constant>NULL</constant>
-on failure.
-    </para>
-  </listitem>
-  <listitem>
     <funcsynopsis id='TRANSSetOption'>
       <funcprototype>
         <funcdef>int <function>TRANS(SetOption)</function></funcdef>
@@ -487,8 +443,7 @@ Based on current usage, the complimentary function
     <para>
 This function sets up the server endpoint for listening. The parameter
 <parameter>connection</parameter> is an endpoint that was obtained from
-<function>TRANS(OpenCOTSServer)()</function> or
-<function>TRANS(OpenCLTSServer)()</function>. The parameter
+<function>TRANS(OpenCOTSServer)()</function>. The parameter
 <parameter>port</parameter> specifies the port to which this endpoint
 should be bound for listening. If port is <constant>NULL</constant>,
 then the transport may attempt to allocate any available TSAP for this
@@ -578,8 +533,7 @@ This function provides the same functionality as the
     </funcsynopsis>
     <para>
 This function will return the number of bytes requested on a COTS
-connection, and will return the minimum of the number bytes requested or
-the size of the incoming packet on a CLTS connection.
+connection, and will return the minimum of the number bytes requested.
     </para>
   </listitem>
   <listitem>
@@ -593,7 +547,7 @@ the size of the incoming packet on a CLTS connection.
     </funcsynopsis>
     <para>
 This function will write the requested number of bytes on a COTS
-connection, and will send a packet of the requested size on a CLTS connection.
+connection.
     </para>
   </listitem>
   <listitem>
@@ -727,25 +681,6 @@ the number of transports returned, and <parameter>connections_ret</parameter>
 is the list of transports.
     </para>
   </listitem>
-  <listitem>
-    <funcsynopsis id='TRANSMakeAllCLTSServerListeners'>
-      <funcprototype>
-        <funcdef>int <function>TRANS(MakeAllCLTSServerListeners)</function></funcdef>
-        <paramdef>const char *<parameter>port</parameter></paramdef>
-        <paramdef>int *<parameter>partial_ret</parameter></paramdef>
-        <paramdef>int *<parameter>count_ret</parameter></paramdef>
-        <paramdef>XtransConnInfo **<parameter>connections_ret</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <para>
-This function should be used by most servers. It will try to establish a
-CLTS server endpoint for each transport listed in the transport table.
-<parameter>partial_ret</parameter> will be set to <symbol>True</symbol> if
-only a partial network could be created. <parameter>count_ret</parameter> is
-the number of transports returned, and <parameter>connections_ret</parameter>
-is the list of transports.
-    </para>
-  </listitem>
 </itemizedlist>
 </sect1>
 
@@ -868,52 +803,6 @@ will open the transport.
     </para>
   </listitem>
   <listitem>
-    <funcsynopsis id='OpenCLTSClient'>
-      <funcprototype>
-        <funcdef>XtransConnInfo *<function>OpenCLTSClient</function></funcdef>
-        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
-        <paramdef>const char *<parameter>protocol</parameter></paramdef>
-        <paramdef>const char *<parameter>host</parameter></paramdef>
-        <paramdef>const char *<parameter>port</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <para>
-This function creates a Connection-Less Transport. The parameter
-<parameter>thistrans</parameter> points to an Xtransport entry in the
-transport table. The parameters <parameter>protocol</parameter>,
-<parameter>host</parameter>, and <parameter>port</parameter> point to strings
-containing the corresponding parts of the address that was passed into
-<link linkend='TRANSOpenCLTSClient'><function>TRANS(OpenCLTSClient)()</function></link>.
-This function must allocate and initialize the contents of the XtransConnInfo
-structure that is returned by this function. This function will open the
-transport, and bind it into the transport namespace if applicable. The
-local address portion of the XtransConnInfo structure will also be filled
-in by this function.
-    </para>
-  </listitem>
-  <listitem>
-    <funcsynopsis id='OpenCLTSServer'>
-      <funcprototype>
-        <funcdef>XtransConnInfo *<function>OpenCLTSServer</function></funcdef>
-        <paramdef>struct _Xtransport *<parameter>thistrans</parameter></paramdef>
-        <paramdef>const char *<parameter>protocol</parameter></paramdef>
-        <paramdef>const char *<parameter>host</parameter></paramdef>
-        <paramdef>const char *<parameter>port</parameter></paramdef>
-      </funcprototype>
-    </funcsynopsis>
-    <para>
-This function creates a Connection-Less Transport. The parameter
-<parameter>thistrans</parameter> points to an Xtransport entry in the
-transport table. The parameters <parameter>protocol</parameter>,
-<parameter>host</parameter>, and <parameter>port</parameter> point to strings
-containing the corresponding parts of the address that was passed into
-<link linkend='TRANSOpenCLTSServer'><function>TRANS(OpenCLTSServer)()</function></link>.
-This function must allocate and initialize the contents of the
-XtransConnInfo structure that is returned by this function. This
-function will open the transport.
-    </para>
-  </listitem>
-  <listitem>
     <funcsynopsis id='SetOption'>
       <funcprototype>
         <funcdef>int <function>SetOption</function></funcdef>