From 33a9ff576a91abd578a82ff309f04e30fa5f883e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 26 Dec 2003 14:36:51 +0000 Subject: [PATCH] Fix over-zellous restriction of chars in Names git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@955 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/lib/lex.c | 10 ---------- bacula/src/lib/parse_conf.c | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c index b51f2ab692..3b2a25bac3 100644 --- a/bacula/src/lib/lex.c +++ b/bacula/src/lib/lex.c @@ -546,16 +546,6 @@ lex_get_token(LEX *lf, int expect) scan_err3(lf, "name %s length %d too long, max is %d\n", lf->str, lf->str_len, MAX_RES_NAME_LENGTH); token = T_ERROR; - } else { - POOLMEM *msg = get_pool_memory(PM_EMSG); - if (is_name_valid(lf->str, &msg)) { - token = T_NAME; - free_pool_memory(msg); - } else { - scan_err1(lf, "%s\n", msg); - free_pool_memory(msg); - token = T_ERROR; - } } break; diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c index 87f0ceb21f..927deb90c1 100755 --- a/bacula/src/lib/parse_conf.c +++ b/bacula/src/lib/parse_conf.c @@ -322,7 +322,12 @@ static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd */ void store_name(LEX *lc, struct res_items *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 */ *(item->value) = bstrdup(lc->str); scan_to_eol(lc); -- 2.39.5