Fix bug #1246 Sometimes access denied with VSS enabled. UCS

[bacula/bacula] / bacula / src / filed / filed.c

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 9fad17c43ba22e216b9a0821aff3ed4515b8aacd..21b7c68fc374e71d40f0cc1a61904290438e2df2 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -37,8 +37,22 @@
 #include "bacula.h"
 #include "filed.h"
 
+#ifdef HAVE_PYTHON
+
+#undef _POSIX_C_SOURCE
+#include <Python.h>
+
+#include "lib/pythonlib.h"
+
+/* Imported Functions */
+extern PyObject *job_getattr(PyObject *self, char *attrname);
+extern int job_setattr(PyObject *self, char *attrname, PyObject *value);
+
+#endif /* HAVE_PYTHON */
+
 /* Imported Functions */
 extern void *handle_client_request(void *dir_sock);
+extern bool parse_fd_config(CONFIG *config, const char *configfile, int exit_code);
 
 /* Forward referenced functions */
 void terminate_filed(int sig);
@@ -49,14 +63,13 @@ CLIENT *me;                           /* my resource */
 bool no_signals = false;
 void *start_heap;
 
-
 #define CONFIG_FILE "bacula-fd.conf" /* default config file */
 
 char *configfile = NULL;
 static bool foreground = false;
 static workq_t dir_workq;             /* queue of work from Director */
 static pthread_t server_tid;
-
+static CONFIG *config;
 
 static void usage()
 {
@@ -94,6 +107,9 @@ int main (int argc, char *argv[])
    bool test_config = false;
    char *uid = NULL;
    char *gid = NULL;
+#ifdef HAVE_PYTHON
+   init_python_interpreter_args python_args;
+#endif /* HAVE_PYTHON */
 
    start_heap = sbrk(0);
    setlocale(LC_ALL, "");
@@ -181,7 +197,8 @@ int main (int argc, char *argv[])
       configfile = bstrdup(CONFIG_FILE);
    }
 
-   parse_config(configfile);
+   config = new_config_parser();
+   parse_fd_config(config, configfile, M_ERROR_TERM);
 
    if (init_crypto() != 0) {
       Emsg0(M_ERROR, 0, _("Cryptography library initialization failed.\n"));
@@ -208,13 +225,25 @@ int main (int argc, char *argv[])
    create_pid_file(me->pid_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
    read_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
 
+   load_fd_plugins(me->plugin_directory);
+
    drop(uid, gid);
 
 #ifdef BOMB
    me += 1000000;
 #endif
 
-   init_python_interpreter(me->hdr.name, me->scripts_directory, "FDStartUp");
+#ifdef HAVE_PYTHON
+   python_args.progname = me->hdr.name;
+   python_args.scriptdir = me->scripts_directory;
+   python_args.modulename = "FDStartUp";
+   python_args.configfile = configfile;
+   python_args.workingdir = me->working_directory;
+   python_args.job_getattr = job_getattr;
+   python_args.job_setattr = job_setattr;
+
+   init_python_interpreter(&python_args);
+#endif /* HAVE_PYTHON */
 
    set_thread_concurrency(10);
 
@@ -244,10 +273,12 @@ void terminate_filed(int sig)
       exit(1);                        /* prevent loops */
    }
    already_here = true;
+   debug_level = 0;                   /* turn off debug */
    stop_watchdog();
 
    bnet_stop_thread_server(server_tid);
    generate_daemon_event(NULL, "Exit");
+   unload_plugins();
    write_state_file(me->working_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
    delete_pid_file(me->pid_directory, "bacula-fd", get_first_port_host_order(me->FDaddrs));
 
@@ -258,10 +289,15 @@ void terminate_filed(int sig)
    if (debug_level > 0) {
       print_memory_pool_stats();
    }
+   if (config) {
+      config->free_resources();
+      free(config);
+      config = NULL;
+   }
    term_msg();
-   free_config_resources();
    cleanup_crypto();
    close_memory_pool();               /* release free memory in pool */
+   lmgr_cleanup_main();
    sm_dump(false);                    /* dump orphaned buffers */
    exit(sig);
 }