X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fdird.c;h=1c74ea049170772121247d73a8d595c7431a86f2;hb=786be614c53783a10956e6ea4c9ef1f643edf07a;hp=493bff07f3120097905c3b0852ddbdb6c6fa1a01;hpb=9455bfaae91fd666a32b4a4122d52bd4408e97bf;p=bacula%2Fbacula diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c index 493bff07f3..1c74ea0491 100644 --- a/bacula/src/dird/dird.c +++ b/bacula/src/dird/dird.c @@ -1,12 +1,12 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2009 Free Software Foundation Europe e.V. + Copyright (C) 2000-2012 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. This program is Free Software; you can redistribute it and/or - modify it under the terms of version two of the GNU General Public + modify it under the terms of version three of the GNU Affero General Public License as published by the Free Software Foundation and included in the file LICENSE. @@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -53,6 +53,7 @@ extern int job_setattr(PyObject *self, char *attrname, PyObject *value); void terminate_dird(int sig); static bool check_resources(); static void dir_sql_query(JCR *jcr, const char *cmd); +static void cleanup_old_files(); /* Exported subroutines */ extern "C" void reload_config(int sig); @@ -109,7 +110,7 @@ static void usage() fprintf(stderr, _( PROG_COPYRIGHT "\nVersion: %s (%s)\n\n" -"Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n" +"Usage: bacula-dir [-f -s] [-c config_file] [-d debug_level] [config_file]\n" " -c set configuration file to file\n" " -d set debug level to \n" " -dt print timestamp in debug output\n" @@ -282,6 +283,8 @@ int main (int argc, char *argv[]) drop(uid, gid, false); /* reduce privileges if requested */ + cleanup_old_files(); + /* If we are in testing mode, we don't try to fix the catalog */ cat_op mode=(test_config)?CHECK_CONNECTION:UPDATE_AND_FIX; @@ -296,8 +299,8 @@ int main (int argc, char *argv[]) my_name_is(0, NULL, director->name()); /* set user defined name */ /* Plug database interface for library routines */ - p_sql_query = (sql_query)dir_sql_query; - p_sql_escape = (sql_escape)db_escape_string; + p_sql_query = (sql_query_func)dir_sql_query; + p_sql_escape = (sql_escape_func)db_escape_string; FDConnectTimeout = (int)director->FDConnectTimeout; SDConnectTimeout = (int)director->SDConnectTimeout; @@ -447,7 +450,7 @@ static void free_saved_resources(int table) */ static void reload_job_end_cb(JCR *jcr, void *ctx) { - int reload_id = (int)((long int)ctx); + int reload_id = (int)((intptr_t)ctx); Dmsg3(100, "reload job_end JobId=%d table=%d cnt=%d\n", jcr->JobId, reload_id, reload_table[reload_id].job_count); lock_jobs(); @@ -914,6 +917,46 @@ static bool check_resources() } } + /* Loop over Storages */ + STORE *store; + foreach_res(store, R_STORAGE) { + /* tls_require implies tls_enable */ + if (store->tls_require) { + if (have_tls) { + store->tls_enable = true; + } else { + Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n")); + OK = false; + continue; + } + } + + 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); + OK = false; + } + + /* If everything is well, attempt to initialize our per-resource TLS context */ + 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 */ + store->tls_ctx = new_tls_context(store->tls_ca_certfile, + store->tls_ca_certdir, store->tls_certfile, + store->tls_keyfile, NULL, NULL, NULL, true); + + if (!store->tls_ctx) { + Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Storage \"%s\" in %s.\n"), + store->name(), configfile); + OK = false; + } + } + } + UnlockRes(); if (OK) { close_msg(NULL); /* close temp message handler */ @@ -931,7 +974,6 @@ static bool check_resources() static bool check_catalog(cat_op mode) { bool OK = true; - bool need_tls; /* Loop over databases */ CAT *catalog; @@ -941,10 +983,11 @@ static bool check_catalog(cat_op mode) * Make sure we can open catalog, otherwise print a warning * message because the server is probably not running. */ - 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); + db = db_init_database(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, + catalog->disable_batch_insert); if (!db || !db_open_database(NULL, db)) { Pmsg2(000, _("Could not open Catalog \"%s\", database \"%s\".\n"), catalog->name(), catalog->db_name); @@ -958,7 +1001,7 @@ static bool check_catalog(cat_op mode) OK = false; continue; } - + /* Display a message if the db max_connections is too low */ if (!db_check_max_connections(NULL, db, director->MaxConcurrentJobs)) { Pmsg1(000, "Warning, settings problem for Catalog=%s\n", catalog->name()); @@ -1000,6 +1043,14 @@ static bool check_catalog(cat_op mode) CLIENT *client; foreach_res(client, R_CLIENT) { CLIENT_DBR cr; + /* Create clients only if they use the current catalog */ + if (client->catalog != catalog) { + Dmsg3(500, "Skip client=%s with cat=%s not catalog=%s\n", + client->name(), client->catalog->name(), catalog->name()); + continue; + } + Dmsg2(500, "create cat=%s for client=%s\n", + client->catalog->name(), client->name()); memset(&cr, 0, sizeof(cr)); bstrncpy(cr.Name, client->name(), sizeof(cr.Name)); db_create_client_record(NULL, db, &cr); @@ -1009,15 +1060,15 @@ static bool check_catalog(cat_op mode) STORE *store; foreach_res(store, R_STORAGE) { STORAGE_DBR sr; - MEDIATYPE_DBR mr; + MEDIATYPE_DBR mtr; memset(&sr, 0, sizeof(sr)); - memset(&mr, 0, sizeof(mr)); + memset(&mtr, 0, sizeof(mtr)); if (store->media_type) { - bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType)); - mr.ReadOnly = 0; - db_create_mediatype_record(NULL, db, &mr); + bstrncpy(mtr.MediaType, store->media_type, sizeof(mtr.MediaType)); + mtr.ReadOnly = 0; + db_create_mediatype_record(NULL, db, &mtr); } else { - mr.MediaTypeId = 0; + mtr.MediaTypeId = 0; } bstrncpy(sr.Name, store->name(), sizeof(sr.Name)); sr.AutoChanger = store->autochanger; @@ -1035,41 +1086,6 @@ static bool check_catalog(cat_op mode) OK = false; } } - - /* tls_require implies tls_enable */ - if (store->tls_require) { - if (have_tls) { - store->tls_enable = true; - } else { - Jmsg(NULL, M_FATAL, 0, _("TLS required but not configured in Bacula.\n")); - OK = false; - } - } - - 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); - OK = false; - } - - /* If everything is well, attempt to initialize our per-resource TLS context */ - 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 */ - store->tls_ctx = new_tls_context(store->tls_ca_certfile, - store->tls_ca_certdir, store->tls_certfile, - store->tls_keyfile, NULL, NULL, NULL, true); - - if (!store->tls_ctx) { - Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Storage \"%s\" in %s.\n"), - store->name(), configfile); - OK = false; - } - } } /* Loop over all counters, defining them in each database */ @@ -1104,9 +1120,39 @@ static bool check_catalog(cat_op mode) db_sql_query(db, cleanup_running_job, NULL, NULL); } + /* Set type in global for debugging */ + set_db_type(db_get_type(db)); + db_close_database(NULL, db); } - /* Set type in global for debugging */ - set_db_type(db_get_type()); return OK; } + +static void copy_base_name(POOLMEM *cleanup) +{ + int len = strlen(director->working_directory); +#if defined(HAVE_WIN32) + pm_strcpy(cleanup, "del /q "); +#else + pm_strcpy(cleanup, "/bin/rm -f "); +#endif + pm_strcat(cleanup, director->working_directory); + if (len > 0 && !IsPathSeparator(director->working_directory[len-1])) { + pm_strcat(cleanup, "/"); + } + pm_strcat(cleanup, my_name); +} + +static void cleanup_old_files() +{ + POOLMEM *cleanup = get_pool_memory(PM_MESSAGE); + POOLMEM *results = get_pool_memory(PM_MESSAGE); + copy_base_name(cleanup); + pm_strcat(cleanup, "*.restore.*.bsr"); + run_program(cleanup, 0, results); + copy_base_name(cleanup); + pm_strcat(cleanup, "*.mail"); + run_program(cleanup, 0, results); + free_pool_memory(cleanup); + free_pool_memory(results); +}