From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 4 Jun 2009 12:42:06 +0000 (+0000)
Subject: ebl  tweak output
X-Git-Tag: Release-3.0.2~181
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b3d16d6c193ef2f61f7cc3fbefc72a8c8b1b79d8;p=bacula%2Fbacula

ebl  tweak output


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8885 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/tests/source-addr-test b/regress/tests/source-addr-test
index bf8640aca3..dfcaa6631d 100755
--- a/regress/tests/source-addr-test
+++ b/regress/tests/source-addr-test
@@ -38,8 +38,6 @@ if [ "$IP" = '' ]; then
     exit 0
 fi
 
-print_debug "Detected ip address is $IP"
-
 outf="tmp/sed_tmp"
 echo "s/PidDirectory/DirSourceAddress=$IP; PidDirectory/g" > $outf
 echo "s/Address =/Address = 127.0.0.1 #/g" >> $outf 
@@ -72,20 +70,23 @@ END_OF_DATA
 
 run_bacula
 
-print_debug "Connections to SD sourced from ${IP}:"
+print_debug "Detecting connections to SD sourced from ${IP}"
 netstat -tan | grep -E "127.0.0.1(.|:)$SDPORT .* ${IP}" > $tmp/log3.out
 if [ $? -ne 0 ]; then
    stat=2
    print_debug "Couldn't detect a connection to the SD sourced from SourceAddress ${IP}" 
 fi
 
-print_debug "Connections to FD sourced from ${IP}:"
+print_debug "and connections to FD sourced from ${IP}"
 netstat -tan | grep -E "127.0.0.1(.|:)$FDPORT .* ${IP}" >> $tmp/log3.out
 if [ $? -ne 0 ]; then
    stat=2
    print_debug "Couldn't detect a connection to the FD sourced from SourceAddress ${IP}"
 fi
 
+if [ "$debug" = 1 ] ; then
+    cat $tmp/log3.out
+fi
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null