- Tweak catalog make scripts.

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

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 57b5fee1ed324029be9074be3dcef3ce4bd5ea28..2d0afc38f73e14e27af7d692559332e54926c122 100644 (file)
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -27,7 +27,8 @@
 /* Forward referenced subroutines */
 static void terminate_dird(int sig);
 static int check_resources();
-
+static void dir_sql_query(JCR *jcr, const char *cmd);
+  
 /* Exported subroutines */
 extern "C" void reload_config(int sig);
 extern void invalidate_schedules();
@@ -60,8 +61,14 @@ extern int r_first, r_last;           /* first and last resources */
 extern RES_TABLE resources[];
 extern RES **res_head;
 extern RES_ITEM job_items[];
-extern URES res_all;
 
+#if defined(_MSC_VER)
+extern "C" { // work around visual compiler mangling variables
+    extern URES res_all;
+}
+#else
+extern URES res_all;
+#endif
 
 #define CONFIG_FILE "./bacula-dir.conf" /* default configuration file */
 
@@ -206,6 +213,9 @@ int main (int argc, char *argv[])
 
    my_name_is(0, NULL, director->hdr.name);    /* set user defined name */
 
+   /* Plug database interface for library routines */
+   p_sql_query = (sql_query)dir_sql_query;                                   
+
    FDConnectTimeout = (int)director->FDConnectTimeout;
    SDConnectTimeout = (int)director->SDConnectTimeout;
 
@@ -250,6 +260,16 @@ int main (int argc, char *argv[])
    }
 
    terminate_dird(0);
+
+   return 0;
+}
+
+static void dir_sql_query(JCR *jcr, const char *cmd)
+{
+   if (!jcr || !jcr->db) {
+      return;
+   }
+   db_sql_query(jcr->db, cmd, NULL, NULL);
 }
 
 /* Cleanup and then exit */
@@ -555,6 +575,19 @@ static int check_resources()
                job->storage->append(st);
             }
          }
+         /* Handle RunScripts alists specifically */
+         if (jobdefs->RunScripts) {
+            RUNSCRIPT *rs, *elt;
+            
+            if (!job->RunScripts) {
+               job->RunScripts = New(alist(10, not_owned_by_alist));
+            }
+           
+            foreach_alist(rs, jobdefs->RunScripts) {
+               elt = copy_runscript(rs);
+               job->RunScripts->append(elt); /* we have to free it */
+            }
+         }
 
          /* Transfer default items from JobDefs Resource */
          for (i=0; job_items[i].name; i++) {