X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Fparse_conf.c;h=527b724149f4f011eeaf9b6c8d57f8a722c67d74;hb=bb827dbd7f8f7421aace966d6c29e42399d01fbd;hp=217a4d50e626c85c572e0b8c112afe699dfb5c4b;hpb=71025c877b28da7326d650dd3598b9bd64d00e23;p=bacula%2Fbacula diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c index 217a4d50e6..527b724149 100755 --- a/bacula/src/lib/parse_conf.c +++ b/bacula/src/lib/parse_conf.c @@ -34,7 +34,7 @@ */ /* - Copyright (C) 2000-2003 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -64,12 +64,22 @@ extern int debug_level; */ extern int r_first; extern int r_last; -extern pthread_mutex_t res_mutex; -extern struct s_res resources[]; -extern CURES res_all; +extern RES_TABLE resources[]; +extern RES **res_head; + +#ifdef HAVE_WIN32 +// work around visual studio name manling preventing external linkage since res_all +// is declared as a different type when instantiated. +extern "C" CURES res_all; +extern "C" int res_all_size; +#else +extern CURES res_all; extern int res_all_size; +#endif -static int res_locked = 0; /* set when resource chains locked */ + +static brwlock_t res_lock; /* resource lock */ +static int res_locked = 0; /* set when resource chains locked -- for debug */ /* Forward referenced subroutines */ static void scan_types(LEX *lc, MSGS *msg, int dest, char *where, char *cmd); @@ -80,7 +90,7 @@ static void scan_types(LEX *lc, MSGS *msg, int dest, char *where, char *cmd); /* Message resource directives * name handler value code flags default_value */ -struct res_items msgs_items[] = { +RES_ITEM msgs_items[] = { {"name", store_name, ITEM(res_msgs.hdr.name), 0, 0, 0}, {"description", store_str, ITEM(res_msgs.hdr.desc), 0, 0, 0}, {"mailcommand", store_str, ITEM(res_msgs.mail_cmd), 0, 0, 0}, @@ -95,11 +105,11 @@ struct res_items msgs_items[] = { {"director", store_msgs, ITEM(res_msgs), MD_DIRECTOR, 0, 0}, {"console", store_msgs, ITEM(res_msgs), MD_CONSOLE, 0, 0}, {"operator", store_msgs, ITEM(res_msgs), MD_OPERATOR, 0, 0}, - {NULL, NULL, NULL, 0} + {NULL, NULL, NULL, 0, 0} }; struct s_mtypes { - char *name; + const char *name; int token; }; /* Various message types */ @@ -122,7 +132,7 @@ static struct s_mtypes msg_types[] = { /* Simply print a message */ -static void prtmsg(void *sock, char *fmt, ...) +static void prtmsg(void *sock, const char *fmt, ...) { va_list arg_ptr; @@ -131,10 +141,10 @@ static void prtmsg(void *sock, char *fmt, ...) va_end(arg_ptr); } -char *res_to_str(int rcode) +const char *res_to_str(int rcode) { if (rcode < r_first || rcode > r_last) { - return "***UNKNOWN***"; + return _("***UNKNOWN***"); } else { return resources[rcode-r_first].name; } @@ -145,17 +155,25 @@ char *res_to_str(int rcode) * Initialize the static structure to zeros, then * apply all the default values. */ -void init_resource(int type, struct res_items *items) +void init_resource(int type, RES_ITEM *items, int pass) { int i; int rindex = type - r_first; + static bool first = true; + int errstat; + + if (first && (errstat=rwl_init(&res_lock)) != 0) { + Emsg1(M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"), + strerror(errstat)); + } + first = false; memset(&res_all, 0, res_all_size); res_all.hdr.rcode = type; res_all.hdr.refcnt = 1; for (i=0; items[i].name; i++) { - Dmsg3(300, "Item=%s def=%s defval=%d\n", items[i].name, + Dmsg3(900, "Item=%s def=%s defval=%d\n", items[i].name, (items[i].flags & ITEM_DEFAULT) ? "yes" : "no", items[i].default_value); if (items[i].flags & ITEM_DEFAULT && items[i].default_value != 0) { @@ -170,6 +188,8 @@ void init_resource(int type, struct res_items *items) *(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; + } else if (pass == 1 && items[i].handler == store_addresses) { + init_default_addresses((dlist**)items[i].value, items[i].default_value); } } /* If this triggers, take a look at lib/parse_conf.h */ @@ -181,84 +201,84 @@ void init_resource(int type, struct res_items *items) /* Store Messages Destination information */ -void store_msgs(LEX *lc, struct res_items *item, int index, int pass) +void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass) { int token; char *cmd; POOLMEM *dest; int dest_len; - Dmsg2(200, "store_msgs pass=%d code=%d\n", pass, item->code); + Dmsg2(900, "store_msgs pass=%d code=%d\n", pass, item->code); if (pass == 1) { switch (item->code) { - case MD_STDOUT: - case MD_STDERR: - case MD_SYSLOG: /* syslog */ - case MD_CONSOLE: - scan_types(lc, (MSGS *)(item->value), item->code, NULL, NULL); - break; - case MD_OPERATOR: /* send to operator */ - case MD_DIRECTOR: /* send to Director */ - case MD_MAIL: /* mail */ - case MD_MAIL_ON_ERROR: /* mail if Job errors */ - if (item->code == MD_OPERATOR) { - cmd = res_all.res_msgs.operator_cmd; - } else { - cmd = res_all.res_msgs.mail_cmd; - } - dest = get_pool_memory(PM_MESSAGE); - dest[0] = 0; - dest_len = 0; - /* Pick up comma separated list of destinations */ - for ( ;; ) { - token = lex_get_token(lc, T_NAME); /* scan destination */ - dest = check_pool_memory_size(dest, dest_len + lc->str_len + 2); - if (dest[0] != 0) { - strcat(dest, " "); /* separate multiple destinations with space */ - dest_len++; - } - strcat(dest, lc->str); - dest_len += lc->str_len; - Dmsg2(100, "store_msgs newdest=%s: dest=%s:\n", lc->str, NPRT(dest)); - token = lex_get_token(lc, T_ALL); - if (token == T_COMMA) { - continue; /* get another destination */ - } - if (token != T_EQUALS) { - scan_err1(lc, "expected an =, got: %s", lc->str); - } - break; - } - Dmsg1(200, "mail_cmd=%s\n", NPRT(cmd)); - scan_types(lc, (MSGS *)(item->value), item->code, dest, cmd); - free_pool_memory(dest); - Dmsg0(200, "done with dest codes\n"); - break; - case MD_FILE: /* file */ - case MD_APPEND: /* append */ - dest = get_pool_memory(PM_MESSAGE); - /* Pick up a single destination */ + case MD_STDOUT: + case MD_STDERR: + case MD_SYSLOG: /* syslog */ + case MD_CONSOLE: + scan_types(lc, (MSGS *)(item->value), item->code, NULL, NULL); + break; + case MD_OPERATOR: /* send to operator */ + case MD_DIRECTOR: /* send to Director */ + case MD_MAIL: /* mail */ + case MD_MAIL_ON_ERROR: /* mail if Job errors */ + if (item->code == MD_OPERATOR) { + cmd = res_all.res_msgs.operator_cmd; + } else { + cmd = res_all.res_msgs.mail_cmd; + } + dest = get_pool_memory(PM_MESSAGE); + dest[0] = 0; + dest_len = 0; + /* Pick up comma separated list of destinations */ + for ( ;; ) { token = lex_get_token(lc, T_NAME); /* scan destination */ - pm_strcpy(&dest, lc->str); - dest_len = lc->str_len; + dest = check_pool_memory_size(dest, dest_len + lc->str_len + 2); + if (dest[0] != 0) { + pm_strcat(&dest, " "); /* separate multiple destinations with space */ + dest_len++; + } + pm_strcat(&dest, lc->str); + dest_len += lc->str_len; + Dmsg2(900, "store_msgs newdest=%s: dest=%s:\n", lc->str, NPRT(dest)); token = lex_get_token(lc, T_ALL); - Dmsg1(200, "store_msgs dest=%s:\n", NPRT(dest)); + if (token == T_COMMA) { + continue; /* get another destination */ + } if (token != T_EQUALS) { - scan_err1(lc, "expected an =, got: %s", lc->str); + scan_err1(lc, _("expected an =, got: %s"), lc->str); } - scan_types(lc, (MSGS *)(item->value), item->code, dest, NULL); - free_pool_memory(dest); - Dmsg0(200, "done with dest codes\n"); break; + } + Dmsg1(900, "mail_cmd=%s\n", NPRT(cmd)); + scan_types(lc, (MSGS *)(item->value), item->code, dest, cmd); + free_pool_memory(dest); + Dmsg0(900, "done with dest codes\n"); + break; + case MD_FILE: /* file */ + case MD_APPEND: /* append */ + dest = get_pool_memory(PM_MESSAGE); + /* Pick up a single destination */ + token = lex_get_token(lc, T_NAME); /* scan destination */ + pm_strcpy(&dest, lc->str); + dest_len = lc->str_len; + token = lex_get_token(lc, T_ALL); + Dmsg1(900, "store_msgs dest=%s:\n", NPRT(dest)); + if (token != T_EQUALS) { + scan_err1(lc, _("expected an =, got: %s"), lc->str); + } + scan_types(lc, (MSGS *)(item->value), item->code, dest, NULL); + free_pool_memory(dest); + Dmsg0(900, "done with dest codes\n"); + break; - default: - scan_err1(lc, "Unknown item code: %d\n", item->code); - break; + default: + scan_err1(lc, _("Unknown item code: %d\n"), item->code); + break; } } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); - Dmsg0(200, "Done store_msgs\n"); + Dmsg0(900, "Done store_msgs\n"); } /* @@ -284,14 +304,14 @@ static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd str = &lc->str[0]; } for (i=0; msg_types[i].name; i++) { - if (strcmp(str, msg_types[i].name) == 0) { + if (strcasecmp(str, msg_types[i].name) == 0) { msg_type = msg_types[i].token; found = TRUE; break; } } if (!found) { - scan_err1(lc, "message type: %s not found", str); + scan_err1(lc, _("message type: %s not found"), str); /* NOT REACHED */ } @@ -309,10 +329,10 @@ static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd if (lc->ch != ',') { break; } - Dmsg0(200, "call lex_get_token() to eat comma\n"); + Dmsg0(900, "call lex_get_token() to eat comma\n"); lex_get_token(lc, T_ALL); /* eat comma */ } - Dmsg0(200, "Done scan_types()\n"); + Dmsg0(900, "Done scan_types()\n"); } @@ -320,10 +340,19 @@ static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd * This routine is ONLY for resource names * Store a name at specified address. */ -void store_name(LEX *lc, struct res_items *item, int index, int pass) +void store_name(LEX *lc, RES_ITEM *item, int index, int pass) { + POOLMEM *msg = get_pool_memory(PM_EMSG); lex_get_token(lc, T_NAME); + if (!is_name_valid(lc->str, &msg)) { + scan_err1(lc, "%s\n", msg); + } + 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); + } *(item->value) = bstrdup(lc->str); scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); @@ -334,7 +363,7 @@ void store_name(LEX *lc, struct res_items *item, int index, int pass) * Store a name string at specified address * A name string is limited to MAX_RES_NAME_LENGTH */ -void store_strname(LEX *lc, struct res_items *item, int index, int pass) +void store_strname(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_NAME); /* Store the name */ @@ -345,10 +374,8 @@ void store_strname(LEX *lc, struct res_items *item, int index, int pass) set_bit(index, res_all.hdr.item_present); } - - /* Store a string at specified address */ -void store_str(LEX *lc, struct res_items *item, int index, int pass) +void store_str(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_STRING); if (pass == 1) { @@ -363,7 +390,7 @@ void store_str(LEX *lc, struct res_items *item, int index, int pass) * shell expansion except if the string begins with a vertical * bar (i.e. it will likely be passed to the shell later). */ -void store_dir(LEX *lc, struct res_items *item, int index, int pass) +void store_dir(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_STRING); if (pass == 1) { @@ -378,7 +405,7 @@ void store_dir(LEX *lc, struct res_items *item, int index, int pass) /* Store a password specified address in MD5 coding */ -void store_password(LEX *lc, struct res_items *item, int index, int pass) +void store_password(LEX *lc, RES_ITEM *item, int index, int pass) { unsigned int i, j; struct MD5Context md5c; @@ -406,7 +433,7 @@ void store_password(LEX *lc, struct res_items *item, int index, int pass) * If we are in pass 2, do a lookup of the * resource. */ -void store_res(LEX *lc, struct res_items *item, int index, int pass) +void store_res(LEX *lc, RES_ITEM *item, int index, int pass) { RES *res; @@ -414,7 +441,11 @@ void store_res(LEX *lc, struct res_items *item, int index, int pass) if (pass == 2) { res = GetResWithName(item->code, lc->str); if (res == NULL) { - scan_err3(lc, "Could not find Resource %s referenced on line %d : %s\n", + scan_err3(lc, _("Could not find config Resource %s referenced on line %d : %s\n"), + lc->str, lc->line_no, lc->line); + } + if (*(item->value)) { + scan_err3(lc, _("Attempt to redefine resource \"%s\" referenced on line %d : %s\n"), lc->str, lc->line_no, lc->line); } *(item->value) = (char *)res; @@ -423,9 +454,46 @@ void store_res(LEX *lc, struct res_items *item, int index, int pass) set_bit(index, res_all.hdr.item_present); } +/* + * Store default values for Resource from xxxDefs + * If we are in pass 2, do a lookup of the + * resource and store everything not explicitly set + * in main resource. + * + * Note, here item points to the main resource (e.g. Job, not + * the jobdefs, which we look up). + */ +void store_defs(LEX *lc, RES_ITEM *item, int index, int pass) +{ + RES *res; + + lex_get_token(lc, T_NAME); + if (pass == 2) { + Dmsg2(900, "Code=%d name=%s\n", item->code, lc->str); + res = GetResWithName(item->code, lc->str); + if (res == NULL) { + scan_err3(lc, _("Missing config Resource \"%s\" referenced on line %d : %s\n"), + lc->str, lc->line_no, lc->line); + } + /* for each item not set, we copy the field from res */ +#ifdef xxx + for (int i=0; item->name;; i++, item++) { + if (bit_is_set(i, res->item_present)) { + Dmsg2(900, "Item %d is present in %s\n", i, res->name); + } else { + Dmsg2(900, "Item %d is not present in %s\n", i, res->name); + } + } + /* ***FIXME **** add code */ +#endif + } + scan_to_eol(lc); +} + + /* Store an integer at specified address */ -void store_int(LEX *lc, struct res_items *item, int index, int pass) +void store_int(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_INT32); *(int *)(item->value) = lc->int32_val; @@ -434,7 +502,7 @@ void store_int(LEX *lc, struct res_items *item, int index, int pass) } /* Store a positive integer at specified address */ -void store_pint(LEX *lc, struct res_items *item, int index, int pass) +void store_pint(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_PINT32); *(int *)(item->value) = lc->pint32_val; @@ -444,7 +512,7 @@ void store_pint(LEX *lc, struct res_items *item, int index, int pass) /* Store an 64 bit integer at specified address */ -void store_int64(LEX *lc, struct res_items *item, int index, int pass) +void store_int64(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_INT64); *(int64_t *)(item->value) = lc->int64_val; @@ -453,12 +521,12 @@ void store_int64(LEX *lc, struct res_items *item, int index, int pass) } /* Store a size in bytes */ -void store_size(LEX *lc, struct res_items *item, int index, int pass) +void store_size(LEX *lc, RES_ITEM *item, int index, int pass) { int token; uint64_t uvalue; - Dmsg0(400, "Enter store_size\n"); + Dmsg0(900, "Enter store_size\n"); token = lex_get_token(lc, T_ALL); errno = 0; switch (token) { @@ -466,25 +534,26 @@ void store_size(LEX *lc, struct res_items *item, int index, int pass) case T_IDENTIFIER: case T_UNQUOTED_STRING: if (!size_to_uint64(lc->str, lc->str_len, &uvalue)) { - scan_err1(lc, "expected a size number, got: %s", lc->str); + scan_err1(lc, _("expected a size number, got: %s"), lc->str); } *(uint64_t *)(item->value) = uvalue; break; default: - scan_err1(lc, "expected a size, got: %s", lc->str); + scan_err1(lc, _("expected a size, got: %s"), lc->str); break; } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); - Dmsg0(400, "Leave store_size\n"); + Dmsg0(900, "Leave store_size\n"); } /* Store a time period in seconds */ -void store_time(LEX *lc, struct res_items *item, int index, int pass) +void store_time(LEX *lc, RES_ITEM *item, int index, int pass) { int token; utime_t utime; + char period[500]; token = lex_get_token(lc, T_ALL); errno = 0; @@ -492,22 +561,34 @@ void store_time(LEX *lc, struct res_items *item, int index, int pass) case T_NUMBER: case T_IDENTIFIER: case T_UNQUOTED_STRING: - if (!duration_to_utime(lc->str, &utime)) { - scan_err1(lc, "expected a time period, got: %s", lc->str); + bstrncpy(period, lc->str, sizeof(period)); + if (lc->ch == ' ') { + token = lex_get_token(lc, T_ALL); + switch (token) { + case T_IDENTIFIER: + case T_UNQUOTED_STRING: + bstrncat(period, lc->str, sizeof(period)); + break; + } + } + if (!duration_to_utime(period, &utime)) { + scan_err1(lc, _("expected a time period, got: %s"), period); } *(utime_t *)(item->value) = utime; break; default: - scan_err1(lc, "expected a time period, got: %s", lc->str); + scan_err1(lc, _("expected a time period, got: %s"), lc->str); break; } - scan_to_eol(lc); + if (token != T_EOL) { + scan_to_eol(lc); + } set_bit(index, res_all.hdr.item_present); } /* Store a yes/no in a bit field */ -void store_yesno(LEX *lc, struct res_items *item, int index, int pass) +void store_yesno(LEX *lc, RES_ITEM *item, int index, int pass) { lex_get_token(lc, T_NAME); if (strcasecmp(lc->str, "yes") == 0) { @@ -515,24 +596,41 @@ void store_yesno(LEX *lc, struct res_items *item, int index, int pass) } else if (strcasecmp(lc->str, "no") == 0) { *(int *)(item->value) &= ~(item->code); } else { - scan_err1(lc, "Expect a YES or NO, got: %s", lc->str); + scan_err1(lc, _("Expect a YES or NO, got: %s"), lc->str); } scan_to_eol(lc); set_bit(index, res_all.hdr.item_present); } +/* #define TRACE_RES */ -void LockRes() +void b_LockRes(const char *file, int line) { - P(res_mutex); - res_locked = 1; + int errstat; +#ifdef TRACE_RES + Dmsg4(000, "LockRes %d,%d at %s:%d\n", res_locked, res_lock.w_active, + file, line); +#endif + if ((errstat=rwl_writelock(&res_lock)) != 0) { + Emsg3(M_ABORT, 0, "rwl_writelock failure at %s:%d: ERR=%s\n", + file, line, strerror(errstat)); + } + res_locked++; } -void UnlockRes() +void b_UnlockRes(const char *file, int line) { - res_locked = 0; - V(res_mutex); + int errstat; + res_locked--; +#ifdef TRACE_RES + Dmsg4(000, "UnLockRes %d,%d at %s:%d\n", res_locked, res_lock.w_active, + file, line); +#endif + if ((errstat=rwl_writeunlock(&res_lock)) != 0) { + Emsg3(M_ABORT, 0, "rwl_writeunlock failure at %s:%d:. ERR=%s\n", + file, line, strerror(errstat)); + } } /* @@ -545,7 +643,7 @@ GetResWithName(int rcode, char *name) int rindex = rcode - r_first; LockRes(); - res = resources[rindex].res_head; + res = res_head[rindex]; while (res) { if (strcmp(res->name, name) == 0) { break; @@ -573,7 +671,7 @@ GetNextRes(int rcode, RES *res) Emsg0(M_ABORT, 0, "Resource chain not locked.\n"); } if (res == NULL) { - nres = resources[rindex].res_head; + nres = res_head[rindex]; } else { nres = res->next; } @@ -590,119 +688,136 @@ enum parse_state { /********************************************************************* * * Parse configuration file - * + * + * Return 0 if reading failed, 1 otherwise */ -void -parse_config(char *cf) +int +parse_config(const char *cf, int exit_on_error) { + set_exit_on_error(exit_on_error); LEX *lc = NULL; int token, i, pass; int res_type = 0; enum parse_state state = p_none; - struct res_items *items = NULL; + RES_ITEM *items = NULL; int level = 0; /* Make two passes. The first builds the name symbol table, * and the second picks up the items. */ - Dmsg0(200, "Enter parse_config()\n"); + Dmsg0(900, "Enter parse_config()\n"); for (pass=1; pass <= 2; pass++) { - Dmsg1(200, "parse_config pass %d\n", pass); - lc = lex_open_file(lc, cf, NULL); + Dmsg1(900, "parse_config pass %d\n", pass); + if ((lc = lex_open_file(lc, cf, NULL)) == NULL) { + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; + } while ((token=lex_get_token(lc, T_ALL)) != T_EOF) { - Dmsg1(150, "parse got token=%s\n", lex_tok_to_str(token)); + Dmsg1(900, "parse got token=%s\n", lex_tok_to_str(token)); switch (state) { - case p_none: - if (token == T_EOL) { + case p_none: + if (token == T_EOL) { + break; + } + if (token != T_IDENTIFIER) { + scan_err1(lc, _("Expected a Resource name identifier, got: %s"), lc->str); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; + } + for (i=0; resources[i].name; i++) + if (strcasecmp(resources[i].name, lc->str) == 0) { + state = p_resource; + items = resources[i].items; + res_type = resources[i].rcode; + init_resource(res_type, items, pass); break; } - if (token != T_IDENTIFIER) { - scan_err1(lc, "Expected a Resource name identifier, got: %s", lc->str); - /* NOT REACHED */ + if (state == p_none) { + scan_err1(lc, _("expected resource name, got: %s"), lc->str); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; + } + break; + case p_resource: + switch (token) { + case T_BOB: + level++; + break; + case T_IDENTIFIER: + if (level != 1) { + scan_err1(lc, _("not in resource definition: %s"), lc->str); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; } - for (i=0; resources[i].name; i++) - if (strcasecmp(resources[i].name, lc->str) == 0) { - state = p_resource; - items = resources[i].items; - res_type = resources[i].rcode; - init_resource(res_type, items); + for (i=0; items[i].name; i++) { + if (strcasecmp(items[i].name, lc->str) == 0) { + /* If the ITEM_NO_EQUALS flag is set we do NOT + * scan for = after the keyword */ + if (!(items[i].flags & ITEM_NO_EQUALS)) { + token = lex_get_token(lc, T_ALL); + Dmsg1 (900, "in T_IDENT got token=%s\n", lex_tok_to_str(token)); + if (token != T_EQUALS) { + scan_err1(lc, _("expected an equals, got: %s"), lc->str); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; + } + } + Dmsg1(900, "calling handler for %s\n", items[i].name); + /* Call item handler */ + items[i].handler(lc, &items[i], i, pass); + i = -1; break; } - if (state == p_none) { - scan_err1(lc, "expected resource name, got: %s", lc->str); - /* NOT REACHED */ + } + if (i >= 0) { + Dmsg2(900, "level=%d id=%s\n", level, lc->str); + Dmsg1(900, "Keyword = %s\n", lc->str); + scan_err1(lc, _("Keyword \"%s\" not permitted in this resource.\n" + "Perhaps you left the trailing brace off of the previous resource."), lc->str); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; } break; - case p_resource: - switch (token) { - case T_BOB: - level++; - break; - case T_IDENTIFIER: - if (level != 1) { - scan_err1(lc, "not in resource definition: %s", lc->str); - /* NOT REACHED */ - } - for (i=0; items[i].name; i++) { - if (strcasecmp(items[i].name, lc->str) == 0) { - /* If the ITEM_NO_EQUALS flag is set we do NOT - * scan for = after the keyword */ - if (!(items[i].flags & ITEM_NO_EQUALS)) { - token = lex_get_token(lc, T_ALL); - Dmsg1 (150, "in T_IDENT got token=%s\n", lex_tok_to_str(token)); - if (token != T_EQUALS) { - scan_err1(lc, "expected an equals, got: %s", lc->str); - /* NOT REACHED */ - } - } - Dmsg1(150, "calling handler for %s\n", items[i].name); - /* Call item handler */ - items[i].handler(lc, &items[i], i, pass); - i = -1; - break; - } - } - if (i >= 0) { - Dmsg2(150, "level=%d id=%s\n", level, lc->str); - Dmsg1(150, "Keyword = %s\n", lc->str); - scan_err1(lc, "Keyword \"%s\" not permitted in this resource", lc->str); - /* NOT REACHED */ - } - break; - case T_EOB: - level--; - state = p_none; - Dmsg0(150, "T_EOB => define new resource\n"); - save_resource(res_type, items, pass); /* save resource */ - break; - - case T_EOL: - break; + case T_EOB: + level--; + state = p_none; + Dmsg0(900, "T_EOB => define new resource\n"); + save_resource(res_type, items, pass); /* save resource */ + break; - default: - scan_err2(lc, "unexpected token %d %s in resource definition", - token, lex_tok_to_str(token)); - /* NOT REACHED */ - } + case T_EOL: break; + default: - scan_err1(lc, "Unknown parser state %d\n", state); - /* NOT REACHED */ + scan_err2(lc, _("unexpected token %d %s in resource definition"), + token, lex_tok_to_str(token)); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; + } + break; + default: + scan_err1(lc, _("Unknown parser state %d\n"), state); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; } } if (state != p_none) { - scan_err0(lc, "End of conf file reached with unclosed resource."); + scan_err0(lc, _("End of conf file reached with unclosed resource.")); + set_exit_on_error(1); /* Never reached if exit_on_error == 1 */ + return 0; } - if (debug_level > 50 && pass == 2) { + if (debug_level >= 900 && pass == 2) { int i; for (i=r_first; i<=r_last; i++) { - dump_resource(i, resources[i-r_first].res_head, prtmsg, NULL); + dump_resource(i, res_head[i-r_first], prtmsg, NULL); } } lc = lex_close_file(lc); } - Dmsg0(200, "Leave parse_config()\n"); + Dmsg0(900, "Leave parse_config()\n"); + set_exit_on_error(1); + return 1; } /********************************************************************* @@ -710,11 +825,29 @@ parse_config(char *cf) * Free configuration resources * */ -void -free_config_resources() +void free_config_resources() { - int i; - for (i=r_first; i<=r_last; i++) { - free_resource(i); + for (int i=r_first; i<=r_last; i++) { + free_resource(res_head[i-r_first], i); + res_head[i-r_first] = NULL; + } +} + +RES **save_config_resources() +{ + int num = r_last - r_first + 1; + RES **res = (RES **)malloc(num*sizeof(RES *)); + for (int i=0; i