regress: Check restore menu with consoles

 - menu item 1
 - menu item 2
 - menu item 3
 - menu item 11

regress: Add test for restore jobid= parameter

regress: Add tests for file=? restore with restricted console

diff --git a/regress/scripts/setup_rconsole b/regress/scripts/setup_rconsole
index 6f08ae9f14c48d1f5964d755f967c09cdb679358..5123d081372b39caeda02619fc16062554d043ef 100755 (executable)
--- a/regress/scripts/setup_rconsole
+++ b/regress/scripts/setup_rconsole
@@ -137,6 +137,20 @@ Console {
   DirectoryAcl = *all*
   UserIdAcl = *all*
 }
+Console {
+  Name = restricted-job-client
+  Password = xxx
+  JobAcl    = backup
+  ClientAcl = test1-fd
+  PoolAcl   = *all*
+  CatalogAcl  = *all*
+  FileSetAcl  = *all*
+  CommandAcl  = *all*
+  StorageAcl  = *all*
+  WhereAcl = *all*
+  DirectoryAcl = *all*
+  UserIdAcl = *all*
+}
 EOF
 
 cat <<EOF >> $tmp/bconsole.conf2
@@ -148,7 +162,7 @@ EOF
 
 sed 's/Password.*/Password = xxx/' $conf/bconsole.conf >> $tmp/bconsole.conf2
 
-for i in job pool client clients fileset bvfs1 bvfs2
+for i in job pool client clients fileset bvfs1 bvfs2 job-client
 do
     sed "s/restricted/restricted-$i/" $tmp/bconsole.conf2 > $tmp/bconsole.conf.$i
 done

diff --git a/regress/tests/console-acl-test b/regress/tests/console-acl-test
index f79d2fa438b8279c876220db5874d85a66220b7c..1229c26fbe7b96b52942b1b4c3a7303f020885ff 100755 (executable)
--- a/regress/tests/console-acl-test
+++ b/regress/tests/console-acl-test
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2023 Kern Sibbald
-# Copyright (C) 2021-2022 Bacula Systems SA
+# Copyright (C) 2000-2021 Kern Sibbald
+# Copyright (C) 2021-2023 Bacula Systems SA
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Run a couple of tests with bconsole and console ACL