#include "dird.h"
/* Forward referenced subroutines */
-static void terminate_dird(int sig);
+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();
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 */
static void usage()
{
fprintf(stderr, _(
-"Copyright (C) 2000-2005 Kern Sibbald.\n"
+"Copyright (C) 2000-%s Kern Sibbald.\n"
"\nVersion: %s (%s)\n\n"
"Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
" -c <file> set configuration file to file\n"
" -u userid\n"
" -v verbose user messages\n"
" -? print this message.\n"
-"\n"), VERSION, BDATE);
+"\n"), BYEAR, VERSION, BDATE);
exit(1);
}
* Main Bacula Server program
*
*/
+#if defined(HAVE_WIN32)
+#define main BaculaMain
+#endif
+
int main (int argc, char *argv[])
{
int ch;
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;
drop(uid, gid); /* reduce priveleges if requested */
+#if !defined(HAVE_WIN32)
signal(SIGHUP, reload_config);
+#endif
init_console_msg(working_directory);
}
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 */
-static void terminate_dird(int sig)
+void terminate_dird(int sig)
{
static bool already_here = false;
void reload_config(int sig)
{
static bool already_here = false;
+#if !defined(HAVE_WIN32)
sigset_t set;
+#endif
JCR *jcr;
int njobs = 0; /* number of running jobs */
int table, rtable;
abort(); /* Oops, recursion -> die */
}
already_here = true;
+
+#if !defined(HAVE_WIN32)
sigemptyset(&set);
sigaddset(&set, SIGHUP);
sigprocmask(SIG_BLOCK, &set, NULL);
+#endif
lock_jobs();
LockRes();
reload_table[table].res_table = save_config_resources();
Dmsg1(100, "Saved old config in table %d\n", table);
- ok = parse_config(configfile, 0); /* no exit on error */
+ ok = parse_config(configfile, 0, M_ERROR); /* no exit on error */
Dmsg0(100, "Reloaded config file\n");
if (!ok || !check_resources()) {
bail_out:
UnlockRes();
unlock_jobs();
+#if !defined(HAVE_WIN32)
sigprocmask(SIG_UNBLOCK, &set, NULL);
signal(SIGHUP, reload_config);
+#endif
already_here = false;
}
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++) {