From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 13 Nov 2003 13:49:12 +0000 (+0000)
Subject: Update smtp to bsmtp and console to bconsole
X-Git-Tag: Release-7.0.0~9915
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=34a061c826d9bd0ad9d8a0c01828c651a5f74f6c;p=bacula%2Fbacula

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 da9ac34c19..bc22c35a4e 100644
--- 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 ee77a34c59..d1e6cc1c36 100755
--- 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 28223b0654..588dddc35b 100755
--- 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 45a30a2425..02a1b702ff 100755
--- 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 0574b9a638..6b5f30c3ef 100755
--- 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 8466a4da32..7e7e1f0bf8 100644
--- 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 e584b9f5d3..64416b8587 100644
--- 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 ed85af448f..ca3b284b01 100644
--- 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 a96910989c..f83fa5b625 100755
--- 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 b902521f3a..b5e2eb5c42 100755
--- 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 d8c097efcc..47b3ffa6d8 100755
--- 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 596850d714..fa676f0bca 100755
--- 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 51b761d97f..9e4e69d969 100755
--- 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 c766d44396..4ade9e483c 100755
--- 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 67df7d12ae..1f41a71d90 100755
--- 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 0406c85633..03fd455081 100755
--- 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 592b601371..4237156f19 100755
--- 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 0782fbd63c..8231cc54af 100755
--- 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 a4397cb126..b2158e6fda 100755
--- 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 a49071420c..29605f8c7e 100755
--- 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 0f9821dc0f..81ea029fdc 100755
--- 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 91ddeb7d38..b51bb92bd7 100755
--- 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 a0358b2809..35e0b2e363 100755
--- 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 ea7d67998d..93da5d8a52 100755
--- 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 5e419e746d..3ba734f327 100755
--- 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 e828c975b4..50b0f0b52b 100755
--- 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 9ac881b002..c9ad79620d 100755
--- 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 8117587c9f..218cbc0e16 100755
--- 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 984f09223e..ff0bfad849 100755
--- 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 c0ee82741a..d25c89c053 100755
--- 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 0b2c250a59..493c1930a1 100755
--- 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 83787a5414..58996d4962 100755
--- 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 f971742437..4e61cf846d 100755
--- 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 1e841c2c84..6d49fa97c9 100755
--- 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 4e81c0a397..d3e8995902 100755
--- 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 fdb4dd29b4..0782eb9690 100755
--- 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
 @#