/*
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.
/* Exported subroutines */
extern "C" void reload_config(int sig);
extern void invalidate_schedules();
-
+extern bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code);
/* Imported subroutines */
JCR *wait_for_next_job(char *runjob);
void store_jobtype(LEX *lc, RES_ITEM *item, int index, int pass);
void store_level(LEX *lc, RES_ITEM *item, int index, int pass);
void store_replace(LEX *lc, RES_ITEM *item, int index, int pass);
+void store_migtype(LEX *lc, RES_ITEM *item, int index, int pass);
void init_device_resources();
static char *runjob = NULL;
static int background = 1;
static void init_reload(void);
-
+static CONFIG *config;
+
/* Globals Exported */
DIRRES *director; /* Director resource */
int FDConnectTimeout;
void *start_heap;
/* Globals Imported */
-extern int r_first, r_last; /* first and last resources */
-extern RES_TABLE resources[];
-extern RES **res_head;
extern RES_ITEM job_items[];
-
#if defined(_MSC_VER)
extern "C" { // work around visual compiler mangling variables
- extern URES res_all;
+ extern URES res_all;
}
#else
extern URES res_all;
"\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"
+" -d <nn> set debug level to <nn>\n"
+" -dt print timestamp in debug output\n"
" -f run in foreground (for debugging)\n"
" -g groupid\n"
" -r <job> run <job> now\n"
init_reload();
daemon_start_time = time(NULL);
+ console_command = run_console_command;
+
while ((ch = getopt(argc, argv, "c:d:fg:r:stu:v?")) != -1) {
switch (ch) {
case 'c': /* specify config file */
break;
case 'd': /* set debug level */
- debug_level = atoi(optarg);
- if (debug_level <= 0) {
- debug_level = 1;
+ if (*optarg == 't') {
+ dbg_timestamp = true;
+ } else {
+ debug_level = atoi(optarg);
+ if (debug_level <= 0) {
+ debug_level = 1;
+ }
}
Dmsg1(10, "Debug level = %d\n", debug_level);
break;
configfile = bstrdup(CONFIG_FILE);
}
- parse_config(configfile);
+ config = new_config_parser();
+ parse_dir_config(config, configfile, M_ERROR_TERM);
if (init_crypto() != 0) {
Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
read_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
}
+ load_dir_plugins(director->plugin_directory);
+
drop(uid, gid); /* reduce privileges if requested */
if (!check_catalog()) {
static bool already_here = false;
if (already_here) { /* avoid recursive temination problems */
+ bmicrosleep(2, 0); /* yield */
exit(1);
}
already_here = true;
+ debug_level = 0; /* turn off debug */
stop_watchdog();
generate_daemon_event(NULL, "Exit");
+ unload_plugins();
write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
delete_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
-// signal(SIGCHLD, SIG_IGN); /* don't worry about children now */
term_scheduler();
term_job_server();
if (runjob) {
if (debug_level > 5) {
print_memory_pool_stats();
}
- free_config_resources();
+ if (config) {
+ config->free_resources();
+ free(config);
+ config = NULL;
+ }
term_ua_server();
term_msg(); /* terminate message handler */
cleanup_crypto();
}
Dmsg1(100, "Reload_config njobs=%d\n", njobs);
- reload_table[table].res_table = save_config_resources();
+ reload_table[table].res_table = config->save_resources();
Dmsg1(100, "Saved old config in table %d\n", table);
- ok = parse_config(configfile, 0, M_ERROR); /* no exit on error */
+ ok = parse_dir_config(config, configfile, M_ERROR);
Dmsg0(100, "Reloaded config file\n");
if (!ok || !check_resources() || !check_catalog()) {
Jmsg(NULL, M_ERROR, 0, _("Please correct configuration file: %s\n"), configfile);
Jmsg(NULL, M_ERROR, 0, _("Resetting previous configuration.\n"));
}
- reload_table[rtable].res_table = save_config_resources();
+ reload_table[rtable].res_table = config->save_resources();
/* Now restore old resoure values */
int num = r_last - r_first + 1;
RES **res_tab = reload_table[table].res_table;
{
bool OK = true;
JOB *job;
+ bool need_tls;
LockRes();
}
}
- if (!director->tls_certfile && director->tls_enable) {
+ need_tls = director->tls_enable || director->tls_authenticate;
+
+ if (!director->tls_certfile && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"),
director->name(), configfile);
OK = false;
}
- if (!director->tls_keyfile && director->tls_enable) {
+ if (!director->tls_keyfile && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Director \"%s\" in %s.\n"),
director->name(), configfile);
OK = false;
}
- if ((!director->tls_ca_certfile && !director->tls_ca_certdir) && director->tls_enable && director->tls_verify_peer) {
+ if ((!director->tls_ca_certfile && !director->tls_ca_certdir) &&
+ need_tls && director->tls_verify_peer) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
" Certificate Dir\" are defined for Director \"%s\" in %s."
" At least one CA certificate store is required"
}
/* If everything is well, attempt to initialize our per-resource TLS context */
- if (OK && (director->tls_enable || director->tls_require)) {
+ if (OK && (need_tls || director->tls_require)) {
/* Initialize TLS context:
* Args: CA certfile, CA certdir, Certfile, Keyfile,
* Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
/* Transfer default items from JobDefs Resource */
for (i=0; job_items[i].name; i++) {
char **def_svalue, **svalue; /* string value */
- int *def_ivalue, *ivalue; /* integer value */
+ uint32_t *def_ivalue, *ivalue; /* integer value */
bool *def_bvalue, *bvalue; /* bool value */
int64_t *def_lvalue, *lvalue; /* 64 bit values */
uint32_t offset;
* Note, our store_bit does not handle bitmaped fields
*/
} else if (job_items[i].handler == store_bit ||
- job_items[i].handler == store_pint ||
+ job_items[i].handler == store_pint32 ||
job_items[i].handler == store_jobtype ||
job_items[i].handler == store_level ||
- job_items[i].handler == store_pint ||
+ job_items[i].handler == store_int32 ||
+ job_items[i].handler == store_migtype ||
job_items[i].handler == store_replace) {
- def_ivalue = (int *)((char *)(job->jobdefs) + offset);
+ def_ivalue = (uint32_t *)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",
job->name(), job_items[i].name, *def_ivalue, i, offset);
- ivalue = (int *)((char *)job + offset);
+ ivalue = (uint32_t *)((char *)job + offset);
*ivalue = *def_ivalue;
set_bit(i, job->hdr.item_present);
/*
}
}
- if (!cons->tls_certfile && cons->tls_enable) {
+ need_tls = cons->tls_enable || cons->tls_authenticate;
+
+ if (!cons->tls_certfile && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"),
cons->name(), configfile);
OK = false;
}
- if (!cons->tls_keyfile && cons->tls_enable) {
+ if (!cons->tls_keyfile && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Console \"%s\" in %s.\n"),
cons->name(), configfile);
OK = false;
}
- if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir) && cons->tls_enable && cons->tls_verify_peer) {
+ if ((!cons->tls_ca_certfile && !cons->tls_ca_certdir)
+ && need_tls && cons->tls_verify_peer) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\" or \"TLS CA"
" Certificate Dir\" are defined for Console \"%s\" in %s."
" At least one CA certificate store is required"
OK = false;
}
/* If everything is well, attempt to initialize our per-resource TLS context */
- if (OK && (cons->tls_enable || cons->tls_require)) {
+ if (OK && (need_tls || cons->tls_require)) {
/* Initialize TLS context:
* Args: CA certfile, CA certdir, Certfile, Keyfile,
* Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
continue;
}
}
-
- if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && client->tls_enable) {
+ need_tls = client->tls_enable || client->tls_authenticate;
+ if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for File daemon \"%s\" in %s.\n"),
client->name(), configfile);
}
/* If everything is well, attempt to initialize our per-resource TLS context */
- if (OK && (client->tls_enable || client->tls_require)) {
+ if (OK && (need_tls || client->tls_require)) {
/* Initialize TLS context:
* Args: CA certfile, CA certdir, Certfile, Keyfile,
* Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
static bool check_catalog()
{
bool OK = true;
+ bool need_tls;
/* Loop over databases */
CAT *catalog;
* Make sure we can open catalog, otherwise print a warning
* message because the server is probably not running.
*/
- db = db_init_database(NULL, catalog->db_name, catalog->db_user,
+ db = db_init(NULL, catalog->db_driver, catalog->db_name, catalog->db_user,
catalog->db_password, catalog->db_address,
catalog->db_port, catalog->db_socket,
catalog->mult_db_connections);
/* Loop over all pools, defining/updating them in each database */
POOL *pool;
foreach_res(pool, R_POOL) {
- create_pool(NULL, db, pool, POOL_OP_UPDATE); /* update request */
- }
-
- /* Loop over all pools for updating RecyclePool */
- foreach_res(pool, R_POOL) {
- update_pool_recyclepool(NULL, db, pool);
+ /*
+ * If the Pool has a catalog resource create the pool only
+ * in that catalog.
+ */
+ if (!pool->catalog || pool->catalog == catalog) {
+ create_pool(NULL, db, pool, POOL_OP_UPDATE); /* update request */
+ update_pool_recyclepool(NULL, db, pool);
+ }
}
STORE *store;
}
}
- if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && store->tls_enable) {
+ need_tls = store->tls_enable || store->tls_authenticate;
+
+ if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && need_tls) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s.\n"),
store->name(), configfile);
}
/* If everything is well, attempt to initialize our per-resource TLS context */
- if (OK && (store->tls_enable || store->tls_require)) {
+ if (OK && (need_tls || store->tls_require)) {
/* Initialize TLS context:
* Args: CA certfile, CA certdir, Certfile, Keyfile,
* Keyfile PEM Callback, Keyfile CB Userdata, DHfile, Verify Peer */
projects / bacula / bacula / blobdiff