* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
static int check_resources();
/* Exported subroutines */
-
extern "C" void reload_config(int sig);
+extern void invalidate_schedules();
/* Imported subroutines */
{
fprintf(stderr, _(
"Copyright (C) 2000-2005 Kern Sibbald.\n"
-"\nVersion: " VERSION " (" BDATE ")\n\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"
" -dnn set debug level to nn\n"
" -u userid\n"
" -v verbose user messages\n"
" -? print this message.\n"
-"\n"));
+"\n"), VERSION, BDATE);
exit(1);
}
char *uid = NULL;
char *gid = NULL;
+ setlocale(LC_ALL, "");
+ bindtextdomain("bacula", LOCALEDIR);
+ textdomain("bacula");
+
init_stack_dump();
my_name_is(argc, argv, "bacula-dir");
- textdomain("bacula");
init_msg(NULL, NULL); /* initialize message handler */
init_reload();
daemon_start_time = time(NULL);
parse_config(configfile);
- if (init_tls() != 0) {
- Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("TLS library initialization failed.\n"));
+ if (init_crypto() != 0) {
+ Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
}
if (!check_resources()) {
Dmsg0(200, "wait for next job\n");
/* Main loop -- call scheduler to get next job to run */
- while ((jcr = wait_for_next_job(runjob))) {
+ while ( (jcr = wait_for_next_job(runjob)) ) {
run_job(jcr); /* run job */
free_jcr(jcr); /* release jcr */
if (runjob) { /* command line, run a single job? */
term_ua_server();
term_msg(); /* terminate message handler */
stop_watchdog();
- cleanup_tls();
+ cleanup_crypto();
close_memory_pool(); /* release free memory in pool */
sm_dump(false);
exit(sig);
RES **res_table;
};
-static const int max_reloads = 10;
+static const int max_reloads = 32;
static RELOAD_TABLE reload_table[max_reloads];
static void init_reload(void)
}
table = rtable; /* release new, bad, saved table below */
} else {
+ invalidate_schedules();
/*
* Hook all active jobs so that they release this table
*/
job_end_push(jcr, reload_job_end_cb, (void *)((long int)table));
njobs++;
}
- free_jcr(jcr);
}
+ endeach_jcr(jcr);
}
/* Reset globals */
for (i=0; job_items[i].name; i++) {
char **def_svalue, **svalue; /* string value */
int *def_ivalue, *ivalue; /* integer value */
+ bool *def_bvalue, *bvalue; /* bool value */
int64_t *def_lvalue, *lvalue; /* 64 bit values */
uint32_t offset;
job->hdr.name, job_items[i].name, *def_svalue, i, offset);
svalue = (char **)((char *)job + offset);
if (*svalue) {
- Pmsg1(000, "Hey something is wrong. p=0x%lu\n", *svalue);
+ Pmsg1(000, _("Hey something is wrong. p=0x%lu\n"), *svalue);
}
*svalue = bstrdup(*def_svalue);
set_bit(i, job->hdr.item_present);
job->hdr.name, job_items[i].name, i, offset);
svalue = (char **)((char *)job + offset);
if (*svalue) {
- Pmsg1(000, "Hey something is wrong. p=0x%lu\n", *svalue);
+ Pmsg1(000, _("Hey something is wrong. p=0x%lu\n"), *svalue);
}
*svalue = *def_svalue;
set_bit(i, job->hdr.item_present);
}
/*
* Handle integer fields
- * Note, our store_yesno does not handle bitmaped fields
+ * Note, our store_bit does not handle bitmaped fields
*/
- } else if (job_items[i].handler == store_yesno ||
+ } else if (job_items[i].handler == store_bit ||
job_items[i].handler == store_pint ||
job_items[i].handler == store_jobtype ||
job_items[i].handler == store_level ||
lvalue = (int64_t *)((char *)job + offset);
*lvalue = *def_lvalue;
set_bit(i, job->hdr.item_present);
+ /*
+ * Handle bool fields
+ */
+ } else if (job_items[i].handler == store_bool) {
+ def_bvalue = (bool *)((char *)(job->jobdefs) + offset);
+ Dmsg5(400, "Job \"%s\", field \"%s\" def_bvalue=%d item %d offset=%u\n",
+ job->hdr.name, job_items[i].name, *def_bvalue, i, offset);
+ bvalue = (bool *)((char *)job + offset);
+ *bvalue = *def_bvalue;
+ set_bit(i, job->hdr.item_present);
}
}
}
for (i=0; job_items[i].name; i++) {
if (job_items[i].flags & ITEM_REQUIRED) {
if (!bit_is_set(i, job->hdr.item_present)) {
- Jmsg(NULL, M_FATAL, 0, "\"%s\" directive in Job \"%s\" resource is required, but not found.\n",
+ Jmsg(NULL, M_FATAL, 0, _("\"%s\" directive in Job \"%s\" resource is required, but not found.\n"),
job_items[i].name, job->hdr.name);
OK = false;
}
}
/* If this triggers, take a look at lib/parse_conf.h */
if (i >= MAX_RES_ITEMS) {
- Emsg0(M_ERROR_TERM, 0, "Too many items in Job resource\n");
+ Emsg0(M_ERROR_TERM, 0, _("Too many items in Job resource\n"));
}
}
} /* End loop over Job res */
catalog->db_port, catalog->db_socket,
catalog->mult_db_connections);
if (!db || !db_open_database(NULL, db)) {
- Jmsg(NULL, M_FATAL, 0, _("Could not open database \"%s\".\n"),
- catalog->db_name);
+ Jmsg(NULL, M_FATAL, 0, _("Could not open Catalog \"%s\", database \"%s\".\n"),
+ catalog->hdr.name, catalog->db_name);
if (db) {
Jmsg(NULL, M_FATAL, 0, _("%s"), db_strerror(db));
}