Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

5 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b31fb76..9a852834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-11  Dave Brolley  <brolley@redhat.com>
+
+	PR7087
+	* stap-client: Don't use -d on netcat. Redirect from /dev/null instead.
+	* stap-server: Likewise.
+	* stap-serverd: Likewise.
+
 2008-12-09  Frank Ch. Eigler  <fche@elastic.org>
 
 	PR6961
@@ -10,6 +17,7 @@
 
 2008-12-09  Dave Brolley  <brolley@redhat.com>
 
+	PR7087
 	* stap-client: Use netcat or nc, whichever is available.
 	* stap-server: Likewise.
 	* stap-serverd: Likewise.
diff --git a/stap-client b/stap-client
index 255551b3..3f530c7e 100755
--- a/stap-client
+++ b/stap-client
@@ -410,7 +410,7 @@ function receive_response {
     # Retrieve the file. Wait for up to 5 minutes for a response.
     for ((attempt=0; $attempt < 300; ++attempt))
     do
-	if $netcat -d $server $(($port+1)) > $tar_server 2>/dev/null; then
+	if $netcat $server $(($port+1)) </dev/null > $tar_server 2>/dev/null; then
 	    return;
 	fi
 	sleep 1
diff --git a/stap-server b/stap-server
index a06adc91..0a7d5977 100755
--- a/stap-server
+++ b/stap-server
@@ -58,7 +58,7 @@ function receive_request {
 	fatal "ERROR: cannot create temporary tar file " $tar_client
 
     # Receive the file.
-    $netcat -ld $port > $tar_client 2>/dev/null &
+    $netcat -l $port < /dev/null > $tar_client 2>/dev/null &
 
     # Wait for 10 seconds before timing out
     for ((t=0; $t < 10; ++t))
diff --git a/stap-serverd b/stap-serverd
index b46a4254..d4d6a773 100755
--- a/stap-serverd
+++ b/stap-serverd
@@ -65,7 +65,7 @@ function listen {
     do
 	for ((attempt=0; $attempt < 5; ++attempt))
 	do
-            $netcat -ld $port 2>/dev/null | process_request &
+            $netcat -l $port < /dev/null 2>/dev/null | process_request &
 	    wait '%$netcat -l'
 	    rc=$?
 	    if test $rc = 0 -o $rc = 127; then
diff --git a/stap.1.in b/stap.1.in
index 16e09523..d4d8ba29 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -190,7 +190,7 @@ points matching the given pattern.  The pattern may include wildcards
 and aliases.
 .TP
 .BI \-L " PROBE"
-Similar to "-l", but list probe points and local variables.
+Similar to "-l", but list probe points and script-level local variables.
 .TP
 .BI \-F
 Load module and start probes, then detach from the module leaving the