Only in src-2.1.7-local: Makefile
diff -ru2 src-2.1.7/tnm/snmp/straps.c src-2.1.7-local/tnm/snmp/straps.c
--- src-2.1.7/tnm/snmp/straps.c	Fri Sep 13 19:57:46 1996
+++ src-2.1.7-local/tnm/snmp/straps.c	Sat Mar 14 22:31:39 1998
@@ -127,4 +127,15 @@
 
     /*
+     * Close any "leftover" FDs from the parent.  There is a relatively
+     * high probability that the parent will be scotty, and that the client
+     * side of the scotty-straps connection is among the open FDs.  This
+     * is bad news if the parent scotty goes away, since this will eventually
+     * cause straps to "block against itself" in the "forward data to client"
+     * write() calls below, since straps itself is not consuming data from
+     * the client side of the leftover open socket.
+     */
+    for (i = 3; i < FD_SETSIZE; i++) (void) close(i);
+
+    /*
      * Open and bind the normal trap socket:
      */
diff -ru2 src-2.1.7/unix/tnmUnixSocket.c src-2.1.7-local/unix/tnmUnixSocket.c
--- src-2.1.7/unix/tnmUnixSocket.c	Wed Sep 18 23:37:21 1996
+++ src-2.1.7-local/unix/tnmUnixSocket.c	Mon Feb  1 22:21:40 1999
@@ -14,4 +14,6 @@
 #include "tnmPort.h"
 
+#include <fcntl.h>
+
 int
 TnmSocket(domain, type, protocol)
@@ -21,5 +23,11 @@
 {
     int s = socket(domain, type, protocol);
-    return (s < 0) ? TNM_SOCKET_ERROR : s;
+    if (s < 0) {
+	return TNM_SOCKET_ERROR;
+    }
+#ifdef O_NONBLOCK
+    fcntl(s, F_SETFL, O_NONBLOCK);
+#endif
+    return s;
 }
 
