- 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 26af749a6afb015e6e6de8d30a3a6eb6e89fb6dc..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();
@@ -212,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;
 
@@ -260,6 +264,14 @@ int main (int argc, char *argv[])
    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 */
 static void terminate_dird(int sig)
 {
@@ -566,13 +578,13 @@ static int check_resources()
          /* 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);
+            
+            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 */
             }
          }