Server address binding + bscan updates -- see kes25Sep02

[bacula/bacula] / bacula / src / dird / job.c

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 75ffdcff865dea1128f0fa411877b34ce14d8ec7..ebf9bac1b4b65c4f390d4c993e8d2170e26ac731 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -45,7 +45,6 @@ extern int do_backup(JCR *jcr);
 extern int do_restore(JCR *jcr);
 extern int do_verify(JCR *jcr);
 extern void backup_cleanup(void);
-extern void start_UA_server(int port);
 
 /* Queue of jobs to be run */
 static workq_t job_wq;               /* our job work queue */
@@ -70,7 +69,7 @@ void run_job(JCR *jcr)
 {
    int stat, errstat;
 
-   init_msg(jcr, jcr->msgs);
+   init_msg(jcr, jcr->messages);
    create_unique_job_name(jcr, jcr->job->hdr.name);
    jcr->jr.SchedTime = jcr->sched_time;
    jcr->jr.StartTime = jcr->start_time;
@@ -92,7 +91,7 @@ void run_job(JCR *jcr)
     * Open database
     */
    Dmsg0(50, "Open database\n");
-   jcr->db=db_init_database(jcr->catalog->db_name, jcr->catalog->db_user,
+   jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
                            jcr->catalog->db_password);
    if (!db_open_database(jcr->db)) {
       Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
@@ -186,7 +185,7 @@ static void job_thread(void *arg)
            jcr->JobStatus = JS_Terminated;
            break;
         default:
-            Dmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
+            Pmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
            break;
         }
    }
@@ -226,7 +225,7 @@ int get_or_create_client_record(JCR *jcr)
       return 0;
    }
    jcr->jr.ClientId = cr.ClientId;
-   Dmsg2(9, "Created Client %s record %d\n", jcr->client->hdr.name, 
+   Dmsg2(100, "Created Client %s record %d\n", jcr->client->hdr.name, 
       jcr->jr.ClientId);
    return 1;
 }
@@ -357,7 +356,7 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
    jcr->pool = job->pool;
    jcr->catalog = job->client->catalog;
    jcr->fileset = job->fileset;
-   jcr->msgs = job->messages; 
+   jcr->messages = job->messages; 
    if (jcr->RestoreBootstrap) {
       free(jcr->RestoreBootstrap);
    }
@@ -398,20 +397,17 @@ void set_jcr_defaults(JCR *jcr, JOB *job)
  */
 static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg) 
 {
-   char *p, *o;
+   char *p;
    const char *str;
    char add[20];
 
+   *omsg = 0;
    Dmsg1(200, "edit_run_codes: %s\n", imsg);
-   add[2] = 0;
-   o = omsg;
    for (p=imsg; *p; p++) {
       if (*p == '%') {
         switch (*++p) {
          case '%':
-            add[0] = '%';
-           add[1] = 0;
-           str = add;
+            str = "%";
            break;
          case 'c':
            str = jcr->client_name;
@@ -444,6 +440,7 @@ static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg)
         default:
             add[0] = '%';
            add[1] = *p;
+           add[2] = 0;
            str = add;
            break;
         }
@@ -453,10 +450,8 @@ static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg)
         str = add;
       }
       Dmsg1(200, "add_str %s\n", str);
-      add_str_to_pool_mem(&omsg, &o, (char *)str);
-      *o = 0;
+      pm_strcat(&omsg, (char *)str);
       Dmsg1(200, "omsg=%s\n", omsg);
    }
-   *o = 0;
    return omsg;
 }