3 files changed, 5 insertions, 22 deletions
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 4e24ade3..937bf263 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.130 2018/03/05 22:33:35 tom Exp $
+ * $LynxId: HTFTP.c,v 1.131 2018/03/11 22:30:30 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -1245,11 +1245,7 @@ static int get_listen_socket(void)
 		if ((status = Rbind(new_socket,
 				    (struct sockaddr *) &soc_address,
 		/* Cast to generic sockaddr */
-				    SOCKADDR_LEN(soc_address)
-#ifndef SHORTENED_RBIND
-				    ,socks_bind_remoteAddr
-#endif /* !SHORTENED_RBIND */
-		     )) == 0) {
+				    SOCKADDR_LEN(soc_address))) == 0) {
 		    break;
 		} else
 #endif /* SOCKS */
@@ -1299,11 +1295,7 @@ static int get_listen_socket(void)
 	    status = Rbind(new_socket,
 			   (struct sockaddr *) &soc_address,
 	    /* Cast to generic sockaddr */
-			   sizeof(soc_address)
-#ifndef SHORTENED_RBIND
-			   ,socks_bind_remoteAddr
-#endif /* !SHORTENED_RBIND */
-		);
+			   sizeof(soc_address));
 	else
 #endif /* SOCKS */
 	    status = bind(new_socket,
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 87de04b9..3cc43bd6 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.138 2017/04/30 17:52:00 tom Exp $
+ * $LynxId: HTTCP.c,v 1.139 2018/03/11 22:30:30 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1356,9 +1356,6 @@ static int HTParseInet(SockA * soc_in, const char *str)
      */
     if (dotcount_ip == 3)	/* Numeric node address: */
     {
-#ifdef DGUX_OLD
-	soc_in->sin_addr.s_addr = inet_addr(host).s_addr;	/* See arpa/inet.h */
-#else
 #ifdef GUSI
 	soc_in->sin_addr = inet_addr(host);	/* See netinet/in.h */
 #else
@@ -1372,7 +1369,6 @@ static int HTParseInet(SockA * soc_in, const char *str)
 	soc_in->sin_addr.s_addr = inet_addr(host);	/* See arpa/inet.h */
 #endif /* HAVE_INET_ATON */
 #endif /* GUSI */
-#endif /* DGUX_OLD */
 	FREE(host);
     } else {			/* Alphanumeric node name: */
 
@@ -1931,9 +1927,6 @@ int HTDoConnect(const char *url,
 #else
 	    status = Rconnect(*s, (struct sockaddr *) &soc_address,
 			      sizeof(soc_address));
-#ifndef SHORTENED_RBIND
-	    socks_bind_remoteAddr = soc_address.sin_addr.s_addr;
-#endif
 #endif /* INET6 */
 	} else
 #endif /* SOCKS */
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 9f49d92c..17210549 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.126 2018/02/19 21:37:37 tom Exp $
+ * $LynxId: HTUtils.h,v 1.127 2018/03/11 22:29:50 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -744,8 +744,6 @@ extern int WWW_TraceMask;
 
 #endif /* USE_SOCKS5 */
 
-#define SHORTENED_RBIND		/* FIXME: do this in configure-script */
-
 #ifdef USE_SSL
 
 #define free_func free__func