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

diff --git a/bacula/src/lib/lex.c b/bacula/src/lib/lex.c
index b51f2ab6927712a88f98c9decf608c916ed9c465..3b2a25bac364f0316deb181925c6ec2a25b98853 100644 (file)
--- 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 87f0ceb21f3800bfd4b13db9d460f8dc63e2f863..927deb90c1bc9dcfc3d41df075cc36c3f32cc0bd 100755 (executable)
--- 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);