From 802e6f8682fc16f4a5dc018bf8a16315e35cfc53 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 22 Apr 2003 10:10:44 +0000
Subject: [PATCH] Fix JobLevel for UA started Admin jobs; add -v to startup
 scripts

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@454 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/scripts/bacula.in     | 6 +++---
 bacula/src/cats/sql_create.c | 1 +
 bacula/src/dird/job.c        | 5 +++++
 bacula/src/dird/ua_run.c     | 3 ++-
 bacula/src/lib/jcr.c         | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bacula/scripts/bacula.in b/bacula/scripts/bacula.in
index dbbed1203c..f530ba66a3 100755
--- a/bacula/scripts/bacula.in
+++ b/bacula/scripts/bacula.in
@@ -166,12 +166,12 @@ failure() {
 case "$1" in
     start)
        echo "Starting the Storage daemon"
-       @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
+       @sbindir@/bacula-sd $2 -v -c @sysconfdir@/bacula-sd.conf
        echo "Starting the File daemon"
-       @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
+       @sbindir@/bacula-fd $2 -v -c @sysconfdir@/bacula-fd.conf
        sleep 2
        echo "Starting the Director daemon"
-       @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
+       @sbindir@/bacula-dir $2 -v -c @sysconfdir@/bacula-dir.conf
        ;;
     stop)
        echo "Stopping the File daemon"
diff --git a/bacula/src/cats/sql_create.c b/bacula/src/cats/sql_create.c
index 9c693e1c01..2d78d31c36 100644
--- a/bacula/src/cats/sql_create.c
+++ b/bacula/src/cats/sql_create.c
@@ -73,6 +73,7 @@ db_create_job_record(void *jcr, B_DB *mdb, JOB_DBR *jr)
    char ed1[30];
 
    stime = jr->SchedTime;
+   ASSERT(stime != 0);
 
    localtime_r(&stime, &tm); 
    strftime(dt, sizeof(dt), "%Y-%m-%d %T", &tm);
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index a1339242f1..d5481b5e96 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -99,6 +99,7 @@ void run_job(JCR *jcr)
    sm_check(__FILE__, __LINE__, True);
    init_msg(jcr, jcr->messages);
    create_unique_job_name(jcr, jcr->job->hdr.name);
+   set_jcr_job_status(jcr, JS_Created);
    jcr->jr.SchedTime = jcr->sched_time;
    jcr->jr.StartTime = jcr->start_time;
    jcr->jr.Type = jcr->JobType;
@@ -271,6 +272,10 @@ static int acquire_resource_locks(JCR *jcr)
    time_t now = time(NULL);
 
    /* Wait until scheduled time arrives */
+   if (jcr->sched_time > now && verbose) {
+      Jmsg(jcr, M_INFO, 0, _("Waiting %d seconds for sched time.\n"), 
+	   jcr->sched_time - now);
+   }
    while (jcr->sched_time > now) {
       Dmsg2(100, "Waiting on sched time, jobid=%d secs=%d\n", jcr->JobId,
 	    jcr->sched_time - now);
diff --git a/bacula/src/dird/ua_run.c b/bacula/src/dird/ua_run.c
index 0293137421..0439326642 100644
--- a/bacula/src/dird/ua_run.c
+++ b/bacula/src/dird/ua_run.c
@@ -350,6 +350,7 @@ When:     %s\n"),
 		 NPRT(jcr->client->hdr.name),
 		 NPRT(jcr->store->hdr.name), 
 		 bstrutime(dt, sizeof(dt), jcr->sched_time));
+	 jcr->JobLevel = L_FULL;
 	 break;
       case JT_BACKUP:
       case JT_VERIFY:
@@ -399,7 +400,7 @@ When:     %s\n"),
 	       jcr->RestoreJobId = atoi(ua->cmd);
 	    }
 	 }
-         jcr->JobLevel = 'F';         /* default level */
+	 jcr->JobLevel = L_FULL;      /* default level */
          Dmsg1(20, "JobId to restore=%d\n", jcr->RestoreJobId);
          bsendmsg(ua, _("Run Restore job\n\
 JobName:    %s\n\
diff --git a/bacula/src/lib/jcr.c b/bacula/src/lib/jcr.c
index ee0c504050..69f46c36cb 100755
--- a/bacula/src/lib/jcr.c
+++ b/bacula/src/lib/jcr.c
@@ -47,7 +47,7 @@ JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr)
    JCR *jcr;
 
    Dmsg0(200, "Enter new_jcr\n");
-   jcr = (JCR *) malloc(size);
+   jcr = (JCR *)malloc(size);
    memset(jcr, 0, size);
    jcr->my_thread_id = pthread_self();
    jcr->sched_time = time(NULL);
-- 
2.39.5