From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 19 Apr 2012 07:04:21 +0000 (+0200)
Subject: Fix restore_job restore keyword
X-Git-Tag: Release-7.0.0~260
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4e592f08c7c87494fe2937ebb3e23b65b39ad09d;p=bacula%2Fbacula

Fix restore_job restore keyword
---

diff --git a/bacula/src/cats/create_sqlite3_database.in b/bacula/src/cats/create_sqlite3_database.in
index 5764be0099..c8b35d48d5 100644
--- a/bacula/src/cats/create_sqlite3_database.in
+++ b/bacula/src/cats/create_sqlite3_database.in
@@ -3,9 +3,10 @@
 # shell script to create Bacula SQLite tables
 
 bindir=@SQLITE_BINDIR@
+PATH=$bindir:$PATH
 cd @working_dir@
 db_name=@db_name@
 
-${bindir}/sqlite3 $* ${db_name}.db <<END-OF-DATA
+sqlite3 $* ${db_name}.db <<END-OF-DATA
 END-OF-DATA
 exit 0
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index 75b049bc43..dce289dfca 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -156,7 +156,7 @@ static struct cmdstruct commands[] = {                                      /* C
  { NT_("query"),      querycmd,      _("Query catalog"),              NT_(""),              false},
  { NT_("restore"),    restore_cmd,   _("Restore files"), 
    NT_("where=</path> client=<client> storage=<storage> bootstrap=<file> "
-       "restore_job=<job>"
+       "restorejob=<job>"
        "\n\tcomment=<text> jobid=<jobid> done select all"), false},
 
  { NT_("relabel"),    relabel_cmd,   _("Relabel a tape"), 
diff --git a/bacula/src/dird/ua_select.c b/bacula/src/dird/ua_select.c
index ffe1baac55..0780aaa000 100644
--- a/bacula/src/dird/ua_select.c
+++ b/bacula/src/dird/ua_select.c
@@ -299,7 +299,7 @@ JOB *select_job_resource(UAContext *ua)
 JOB *get_restore_job(UAContext *ua)
 {
    JOB *job;
-   int i = find_arg_with_value(ua, "restore_job");
+   int i = find_arg_with_value(ua, "restorejob");
    if (i >= 0 && acl_access_ok(ua, Job_ACL, ua->argv[i])) {
       job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
       if (job && job->JobType == JT_RESTORE) {