Update smtp to bsmtp and console to bconsole

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

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index da9ac34c1907c60d04aaaa8799c632031cc7f08d..bc22c35a4e487386ba28c5e7eba408cc732422bb 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -107,8 +107,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all
   operator = @job_email@ = mount
   console = all, !skipped

diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs
index ee77a34c595231f3f2d54645bd2807af6b407b4d..d1e6cc1c36f6dfbfbd8a3f7898971d4af38cdf43 100755 (executable)
--- a/regress/scripts/copy-confs
+++ b/regress/scripts/copy-confs
@@ -2,4 +2,4 @@
 /bin/cp -f scripts/bacula-dir.conf bin/bacula-dir.conf
 /bin/cp -f scripts/bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/console.conf bin/console.conf
+/bin/cp -f scripts/bconsole.conf bin/bconsole.conf

diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs
index 28223b0654fdb42bb95b3b7eaca34a6703a3ae1c..588dddc35b1b2c7eb5a9ad85d926f05bfc4f9023 100755 (executable)
--- a/regress/scripts/copy-tape-confs
+++ b/regress/scripts/copy-tape-confs
@@ -2,4 +2,4 @@
 /bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf
 /bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/test-console.conf bin/console.conf
+/bin/cp -f scripts/test-console.conf bin/bconsole.conf

diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 45a30a2425236888159f845c871e99eeaaef2e24..02a1b702ff8f3adcacde8f91180ee204f90e5521 100755 (executable)
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -2,4 +2,4 @@
 /bin/cp -f scripts/test-bacula-dir.conf bin/bacula-dir.conf
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/test-console.conf bin/console.conf
+/bin/cp -f scripts/test-console.conf bin/bconsole.conf

diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs
index 0574b9a63830735bdfb9e94c17a7526b50efcbeb..6b5f30c3ef0138ca6ecd97e327788c3b185dbdc7 100755 (executable)
--- a/regress/scripts/copy-testa-confs
+++ b/regress/scripts/copy-testa-confs
@@ -2,4 +2,4 @@
 /bin/cp -f scripts/testa-bacula-dir.conf bin/bacula-dir.conf
 /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
 /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/test-console.conf bin/console.conf
+/bin/cp -f scripts/test-console.conf bin/bconsole.conf

diff --git a/regress/scripts/flist b/regress/scripts/flist
index 8466a4da32696681cc853c305f6029aa19feaeb1..7e7e1f0bf850297beaa69d1d5cac9949d66be4f3 100644 (file)
--- a/regress/scripts/flist
+++ b/regress/scripts/flist
@@ -4,7 +4,7 @@
 /build/src/tools/testfind
 /build/Makefile.in
 /build/src/dird/bacula-dir
-/build/src/console/console
+/build/src/console/bconsole
 /build/src/filed/bacula-fd
 /build/src/findlib/find_one.c
 /build/src/jcr.h

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index e584b9f5d3e4521850c0ae51a9b8a6f41177b367..64416b8587f984637e130b5cecd9b9ab1316cfb1 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -261,8 +261,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all
   operator = @job_email@ = mount
   console = all, !skipped
@@ -276,7 +276,7 @@ Messages {
 
 Messages {
   Name = NoEmail
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   console = all, !skipped
 #
 # WARNING! the following will create a file that you must cycle from

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index ed85af448f18ae897f1806d2850c117e2233268d..ca3b284b01ff850988e0e81e348c325d2c9df54e 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -108,8 +108,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all
   operator = @job_email@ = mount
   console = all, !skipped
@@ -119,7 +119,7 @@ Messages {
 
 Messages {
   Name = NoEmail
-  mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   console = all, !skipped
 
   append = "@working_dir@/log" = all, !skipped

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index a96910989ce79a80e682c6854e22fffc97c0e196..f83fa5b62554d0a837c3db525de792f86874f633 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -18,7 +18,7 @@ echo " === Starting Bacula tape test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index b902521f3aa4769c158339b5bad24b1e999d8b09..b5e2eb5c424088cd52f1e2bee5238ca4b1981ccc 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -17,7 +17,7 @@ echo " === Starting Backup Bacula Test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index d8c097efcc9d97054b8f7dc61ed4b02df4fa1258..47b3ffa6d8aa3e2205fb94505b84571790b8df03 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -19,7 +19,7 @@ echo " === Starting bextract-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 596850d7140c21cb05d1bdc26faba8f997fb75dd..fa676f0bcad5125bdea0bdd2c36b49525678991d 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -20,7 +20,7 @@ echo " === Starting bscan-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -50,7 +50,7 @@ bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log2.out

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 51b761d97fe423c561bae266ff9c2db6cab0071f..9e4e69d9691b6ea0f5c13ce198b706dbe07bdb0c 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -21,7 +21,7 @@ echo " === Starting bsr-opt-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index c766d44396c1946afb018fc5b00d9a2d41df74d2..4ade9e483ca7c26b4128c2b516b5a8e8e7555e24 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -18,7 +18,7 @@ echo " === Starting compressed-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 status all
 status all

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 67df7d12ae84cc695a7f9498bd63540b09d0b914..1f41a71d9063d63d89de1d1abc863beb213dae61 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -33,7 +33,7 @@ echo " === Starting concurrent-jobs-test  ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 0406c85633d58950c371fe4a79ed7fc3b15d4fba..03fd4550818839f23718bc4088edb2ccefb68dc2 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -25,7 +25,7 @@ echo " === Starting /dev save/restore test ==="
 echo " "
 echo " "
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 592b60137171797659048f5f3dbf9b2b02b3f5f6..4237156f19e5dd053a8bb2353e0873b8750dfd9c 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -25,7 +25,7 @@ bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 0782fbd63cb07605515c9f680354437481a41ab8..8231cc54afd21942c6127135316c609625e35173 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -18,7 +18,7 @@ echo " "
 
 #bin/bacula start 2>&1 >/dev/null
 bin/bacula start
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index a4397cb1265c76f0ad8f37deeb9a681bdab5befe..b2158e6fda86ebc1302f0254ec2e82afecff46a1 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -19,7 +19,7 @@ echo " === Starting four-jobs-test  ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
@@ -40,7 +40,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -56,7 +56,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -72,7 +72,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -86,7 +86,7 @@ echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all
 yes

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index a49071420cba9d7146b184b4fd60def8948f6feb..29605f8c7ea0baba9df299ba48932836825608e7 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -24,7 +24,7 @@ echo " === Starting incremental-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @tee    tmp/log1.out
@@ -37,7 +37,7 @@ quit
 END_OF_DATA
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @tee    tmp/log1.out

diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index 0f9821dc0f6b1c3d59eef9d5d7a4697c4a9877de..81ea029fdcc111c09a084517fb349366804dc734 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -25,7 +25,7 @@ echo " === Starting /lib save/restore test ==="
 echo " "
 echo " "
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 91ddeb7d3871197fcd6d562c67f459df7d54371e..b51bb92bd7fbde0598b9796fbf5d7a3315a96bdd 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -20,7 +20,7 @@ echo " === Starting recycle-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 label storage=File1 volume=TestVolume001

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index a0358b2809f7af4581a318ec272f5228c90183b8..35e0b2e3634aa8734ee8240ef40825aaf97e6337 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -22,7 +22,7 @@ echo " === Starting restore-by-file-tape test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -74,7 +74,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 #
 # Now do a second backup and restore
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index ea7d67998d7d0ed35fd91d791c0d373e176cc02f..93da5d8a52bdef246894a412bc70c35ffe0c66de 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -26,7 +26,7 @@ echo " === Starting restore-by-file-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 5e419e746dc43720a79a96eea101fadad53f924e..3ba734f327a1a6b014d10b310a792cc0f8f3963b 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -19,7 +19,7 @@ echo " === Starting restore2-by-file-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index e828c975b4991907ac5a20bcbbc931cde6f4f5d3..50b0f0b52bbc92b9f5980cbb85517445b7afa2dd 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -27,7 +27,7 @@ echo " === Starting six-vol-test  ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 9ac881b0026341f529fb2ad12e49fd4e52893197..c9ad79620d3c4fb39dc0a294ea2806fbbca0511f 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -20,7 +20,7 @@ echo " === Starting Small File Size test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 8117587c9f5796d32d4a9b0cee506bc124ac8c4c..218cbc0e167fe650476d52aad0a3507844643cb0 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -20,7 +20,7 @@ echo " === Starting span-vol-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 984f09223e89439f2e795adf822ddbcfe744e913..ff0bfad84921828c04b64997f063200ddd38d42c 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -18,7 +18,7 @@ echo " === Starting sparse-compressed-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index c0ee82741ab41f0b13acf9ab8f476b1e360c75ae..d25c89c05313a9f192850a17137603fa4f230d07 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -18,7 +18,7 @@ echo " === Starting sparse-test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 0b2c250a59e667aab9b595b57203c2b656acecc9..493c1930a18ebd82303207cf3bc3d3650f58eb7d 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -18,7 +18,7 @@ echo " === Starting two-jobs-test  ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
@@ -36,7 +36,7 @@ touch ${cwd}/build/src/dird/*.c
 #
 # run a second job
 #
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 83787a54147d48cae559228e0aff04aaf5f93660..58996d49622d6e58e41cc709dcf22c919d2ce37e 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -18,7 +18,7 @@ echo " === Starting two-vol-test  ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index f9717424377c96f29619937e36714d38a53bd200..4e61cf846ddbc781eecbeee48f1d8ae1b2f7146e 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -22,7 +22,7 @@ echo " === Starting Two Volume Tape test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 1e841c2c841f02f8738328da90e2c1ec48623e34..6d49fa97c93646f447a8375206c4800faf0ca8ff 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -18,7 +18,7 @@ echo " === Starting verify Volume Test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 4e81c0a3973bad874eb3700b0a57af02e4aa69db..d3e89959020893824fa8b8df74564c71630a92ea 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -23,7 +23,7 @@ echo " === Starting weird filenames test ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index fdb4dd29b4251ef9143467ce5cc1f3530ef4937e..0782eb9690bb9aa386739a53be77a0262b6aa3af 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -26,7 +26,7 @@ echo " "
 
 bin/testls weird-files2 >${cwd}/tmp/original
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -46,7 +46,7 @@ ln hard-file3 hard-file2
 rm -f soft-file2
 ln -s soft-file3 soft-file2
 cd ${cwd}
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @#