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 576e14ba238bb989bb027e4aa6d3ec4ad15d706e..21b7c68fc374e71d40f0cc1a61904290438e2df2 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -37,6 +37,19 @@
 #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);
@@ -50,7 +63,6 @@ CLIENT *me;                           /* my resource */
 bool no_signals = false;
 void *start_heap;
 
-
 #define CONFIG_FILE "bacula-fd.conf" /* default config file */
 
 char *configfile = NULL;
@@ -95,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, "");
@@ -218,7 +233,17 @@ int main (int argc, char *argv[])
    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);
 
@@ -272,6 +297,7 @@ void terminate_filed(int sig)
    term_msg();
    cleanup_crypto();
    close_memory_pool();               /* release free memory in pool */
+   lmgr_cleanup_main();
    sm_dump(false);                    /* dump orphaned buffers */
    exit(sig);
 }