X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Fparse_conf.c;h=b39eedf6bf0b12ebd284ac6dbea72d5c2a83ca3c;hb=d8628580f5e43ec26d4816ac521cf2b1675a129b;hp=1811a5ade498b0abaf975ac32a4e5173c9d8c134;hpb=d90c27623a8e65d7467df28c5faff0be8fbddbed;p=bacula%2Fbacula diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c index 1811a5ade4..b39eedf6bf 100644 --- a/bacula/src/lib/parse_conf.c +++ b/bacula/src/lib/parse_conf.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2008 Free Software Foundation Europe e.V. + Copyright (C) 2000-2009 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. @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -69,15 +69,6 @@ #define MAX_PATH 1024 #endif -/* Each daemon has a slightly different set of - * resources, so it will define the following - * global values. - */ -extern int r_first; -extern int r_last; -extern RES_TABLE resources[]; -extern RES **res_head; - /* * Define the Union of all the common resource structure definitions. */ @@ -93,7 +84,6 @@ extern "C" URES res_all; #else extern URES res_all; #endif -extern int res_all_size; extern brwlock_t res_lock; /* resource lock */ @@ -216,11 +206,12 @@ static void init_resource(CONFIG *config, int type, RES_ITEM *items, int pass) } else if (items[i].handler == store_bool) { *(bool *)(items[i].value) = items[i].default_value != 0; } else if (items[i].handler == store_pint32 || - items[i].handler == store_int32) { + items[i].handler == store_int32 || + items[i].handler == store_size32) { *(uint32_t *)(items[i].value) = items[i].default_value; } else if (items[i].handler == store_int64) { *(int64_t *)(items[i].value) = items[i].default_value; - } else if (items[i].handler == store_size) { + } else if (items[i].handler == store_size64) { *(uint64_t *)(items[i].value) = (uint64_t)items[i].default_value; } else if (items[i].handler == store_time) { *(utime_t *)(items[i].value) = (utime_t)items[i].default_value; @@ -284,6 +275,7 @@ void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass) } if (token != T_EQUALS) { scan_err1(lc, _("expected an =, got: %s"), lc->str); + return; } break; } @@ -304,6 +296,7 @@ void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass) Dmsg1(900, "store_msgs dest=%s:\n", NPRT(dest)); if (token != T_EQUALS) { scan_err1(lc, _("expected an =, got: %s"), lc->str); + return; } scan_types(lc, (MSGS *)(item->value), item->code, dest, NULL); free_pool_memory(dest); @@ -312,7 +305,7 @@ void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass) default: scan_err1(lc, _("Unknown item code: %d\n"), item->code); - break; + return; } } scan_to_eol(lc); @@ -352,7 +345,7 @@ static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd } if (!found) { scan_err1(lc, _("message type: %s not found"), str); - /* NOT REACHED */ + return; } if (msg_type == M_MAX+1) { /* all? */ @@ -384,12 +377,14 @@ void store_name(LEX *lc, RES_ITEM *item, int index, int pass) lex_get_token(lc, T_NAME); if (!is_name_valid(lc->str, &msg)) { scan_err1(lc, "%s\n", msg); + return; } free_pool_memory(msg); /* Store the name both pass 1 and pass 2 */ if (*(item->value)) { scan_err2(lc, _("Attempt to redefine name \"%s\" to \"%s\"."), *(item->value), lc->str); + return; } *(item->value) = bstrdup(lc->str); scan_to_eol(lc); @@ -481,10 +476,12 @@ void store_res(LEX *lc, RES_ITEM *item, int index, int pass) if (res == NULL) { scan_err3(lc, _("Could not find config Resource %s referenced on line %d : %s\n"), lc->str, lc->line_no, lc->line); + return; } if (*(item->value)) { scan_err3(lc, _("Attempt to redefine resource \"%s\" referenced on line %d : %s\n"), item->name, lc->line_no, lc->line); + return; } *(item->value) = (char *)res; } @@ -520,6 +517,7 @@ void store_alist_res(LEX *lc, RES_ITEM *item, int index, int pass) if (i >= count) { scan_err4(lc, _("Too many %s directives. Max. is %d. line %d: %s\n"), lc->str, count, lc->line_no, lc->line); + return; } list = New(alist(10, not_owned_by_alist)); } @@ -530,6 +528,7 @@ void store_alist_res(LEX *lc, RES_ITEM *item, int index, int pass) if (res == NULL) { scan_err3(lc, _("Could not find config Resource \"%s\" referenced on line %d : %s\n"), item->name, lc->line_no, lc->line); + return; } Dmsg5(900, "Append %p to alist %p size=%d i=%d %s\n", res, list, list->size(), i, item->name); @@ -592,6 +591,7 @@ void store_defs(LEX *lc, RES_ITEM *item, int index, int pass) if (res == NULL) { scan_err3(lc, _("Missing config Resource \"%s\" referenced on line %d : %s\n"), lc->str, lc->line_no, lc->line); + return; } } scan_to_eol(lc); @@ -628,7 +628,7 @@ void store_int64(LEX *lc, RES_ITEM *item, int index, int pass) } /* Store a size in bytes */ -void store_size(LEX *lc, RES_ITEM *item, int index, int pass) +static void store_size(LEX *lc, RES_ITEM *item, int index, int pass, bool size32) { int token; uint64_t uvalue; @@ -655,12 +655,17 @@ void store_size(LEX *lc, RES_ITEM *item, int index, int pass) } if (!size_to_uint64(bsize, strlen(bsize), &uvalue)) { scan_err1(lc, _("expected a size number, got: %s"), lc->str); + return; + } + if (size32) { + *(uint32_t *)(item->value) = (uint32_t)uvalue; + } else { + *(uint64_t *)(item->value) = uvalue; } - *(uint64_t *)(item->value) = uvalue; break; default: scan_err1(lc, _("expected a size, got: %s"), lc->str); - break; + return; } if (token != T_EOL) { scan_to_eol(lc); @@ -669,6 +674,18 @@ void store_size(LEX *lc, RES_ITEM *item, int index, int pass) Dmsg0(900, "Leave store_size\n"); } +/* Store a size in bytes */ +void store_size32(LEX *lc, RES_ITEM *item, int index, int pass) +{ + store_size(lc, item, index, pass, true /* 32 bit */); +} + +/* Store a size in bytes */ +void store_size64(LEX *lc, RES_ITEM *item, int index, int pass) +{ + store_size(lc, item, index, pass, false /* not 32 bit */); +} + /* Store a time period in seconds */ void store_time(LEX *lc, RES_ITEM *item, int index, int pass) @@ -697,12 +714,13 @@ void store_time(LEX *lc, RES_ITEM *item, int index, int pass) } if (!duration_to_utime(period, &utime)) { scan_err1(lc, _("expected a time period, got: %s"), period); + return; } *(utime_t *)(item->value) = utime; break; default: scan_err1(lc, _("expected a time period, got: %s"), lc->str); - break; + return; } if (token != T_EOL) { scan_to_eol(lc); @@ -721,6 +739,7 @@ void store_bit(LEX *lc, RES_ITEM *item, int index, int pass) *(uint32_t *)(item->value) &= ~(item->code); } else { scan_err2(lc, _("Expect %s, got: %s"), "YES, NO, TRUE, or FALSE", lc->str); /* YES and NO must not be translated */ + return; } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); @@ -736,6 +755,7 @@ void store_bool(LEX *lc, RES_ITEM *item, int index, int pass) *(bool *)(item->value) = false; } else { scan_err2(lc, _("Expect %s, got: %s"), "YES, NO, TRUE, or FALSE", lc->str); /* YES and NO must not be translated */ + return; } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); @@ -761,6 +781,7 @@ void store_label(LEX *lc, RES_ITEM *item, int index, int pass) } if (i != 0) { scan_err1(lc, _("Expected a Tape Label keyword, got: %s"), lc->str); + return; } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); @@ -784,11 +805,11 @@ CONFIG *new_config_parser() void CONFIG::init( const char *cf, LEX_ERROR_HANDLER *scan_error, - int err_type, + int32_t err_type, void *vres_all, - int res_all_size, - int r_first, - int r_last, + int32_t res_all_size, + int32_t r_first, + int32_t r_last, RES_TABLE *resources, RES **res_head) { @@ -811,6 +832,7 @@ void CONFIG::init( * Note, the default behavior unless you have set an alternate * scan_error handler is to die on an error. */ +#ifdef xxx int parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error, int err_type) { @@ -822,6 +844,7 @@ parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error, int err_type) free(config); return ok; } +#endif bool CONFIG::parse_config() @@ -840,16 +863,17 @@ bool CONFIG::parse_config() if (first && (errstat=rwl_init(&res_lock)) != 0) { berrno be; - Emsg1(M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"), + Jmsg1(NULL, M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"), be.bstrerror(errstat)); } first = false; char *full_path = (char *)alloca(MAX_PATH + 1); - if (find_config_file(cf, full_path, MAX_PATH +1)) { - cf = full_path; + if (!find_config_file(cf, full_path, MAX_PATH +1)) { + Jmsg0(NULL, M_ABORT, 0, _("Config filename too long.\n")); } + cf = full_path; /* Make two passes. The first builds the name symbol table, * and the second picks up the items. @@ -955,6 +979,7 @@ bool CONFIG::parse_config() Dmsg0(900, "T_EOB => define new resource\n"); if (res_all.hdr.name == NULL) { scan_err0(lc, _("Name not specified for resource")); + return 0; } save_resource(res_type, items, pass); /* save resource */ break; @@ -979,8 +1004,8 @@ bool CONFIG::parse_config() } if (debug_level >= 900 && pass == 2) { int i; - for (i=r_first; i<=r_last; i++) { - dump_resource(i, res_head[i-r_first], prtmsg, NULL); + for (i=m_r_first; i<=m_r_last; i++) { + dump_resource(i, m_res_head[i-m_r_first], prtmsg, NULL); } } lc = lex_close_file(lc); @@ -1015,24 +1040,29 @@ const char *get_default_configdir() #endif } +/* + * Returns false on error + * true on OK, with full_path set to where config file should be + */ static bool find_config_file(const char *config_file, char *full_path, int max_path) { - if (first_path_separator(config_file) != NULL) { - return false; - } + int file_length = strlen(config_file) + 1; - struct stat st; - - if (stat(config_file, &st) == 0) { - return false; + /* If a full path specified, use it */ + if (first_path_separator(config_file) != NULL) { + if (file_length > max_path) { + return false; + } + bstrncpy(full_path, config_file, file_length); + return true; } + /* config_file is default file name, now find default dir */ const char *config_dir = get_default_configdir(); int dir_length = strlen(config_dir); - int file_length = strlen(config_file); - if ((dir_length + 1 + file_length + 1) > max_path) { + if ((dir_length + 1 + file_length) > max_path) { return false; } @@ -1042,7 +1072,7 @@ find_config_file(const char *config_file, char *full_path, int max_path) full_path[dir_length++] = '/'; } - memcpy(&full_path[dir_length], config_file, file_length + 1); + memcpy(&full_path[dir_length], config_file, file_length); return true; } @@ -1079,6 +1109,8 @@ RES **CONFIG::new_res_head() return res; } + +#ifdef xxx void free_config_resources() { for (int i=r_first; i<=r_last; i++) { @@ -1087,7 +1119,6 @@ void free_config_resources() } } -#ifdef xxx RES **save_config_resources() { int num = r_last - r_first + 1;