summaryrefslogtreecommitdiff
path: root/src/share/common
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-01 15:47:25 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-01 15:47:25 -0500
commit7548a859412f10e68f90ee68f330593d85b090fc (patch)
tree5cfc5a650edf73e093b51225c70506d07fb2bebe /src/share/common
parent6cad3bcedeb83997413e082969dda5427a0bc7f8 (diff)
fix the log output for the ssh-proxycommand
Diffstat (limited to 'src/share/common')
-rw-r--r--src/share/common11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/share/common b/src/share/common
index 9adae05..00a1008 100644
--- a/src/share/common
+++ b/src/share/common
@@ -34,7 +34,8 @@ failure() {
# write output to stderr based on specified LOG_LEVEL the first
# parameter is the priority of the output, and everything else is what
-# is echoed to stderr
+# is echoed to stderr. If there is nothing else, then output comes
+# from stdin, and is not prefaced by log prefix.
log() {
local priority
local level
@@ -79,8 +80,12 @@ log() {
output=true
fi
if [ "$priority" = "$level" -a "$output" = 'true' ] ; then
- echo -n "ms: " >&2
- echo "$@" >&2
+ if [ "$1" ] ; then
+ echo -n "ms: " >&2
+ echo "$@" >&2
+ else
+ cat >&2
+ fi
fi
done
}