BFILE I/O, new console @ commands, regression, file mode restore fixes

[bacula/bacula] / bacula / src / lib / parse_conf.c

diff --git a/bacula/src/lib/parse_conf.c b/bacula/src/lib/parse_conf.c
index a021e1905ea5c79865e36bdab13567f1a669c838..68e9e67050be9a34ff6d1109c425629c54cc1987 100755 (executable)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -679,7 +679,7 @@ parse_config(char *cf)
                     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);
+                        scan_err1(lc, "Keyword \"%s\" not permitted in this resource", lc->str);
                        /* NOT REACHED */
                     }
                     break;
@@ -705,6 +705,9 @@ parse_config(char *cf)
               /* NOT REACHED */
         }
       }
+      if (state != p_none) {
+         scan_err0(lc, "End of conf file reached with unclosed resource.");
+      }
       if (debug_level > 50 && pass == 2) {
         int i;
         for (i=r_first; i<=r_last; i++) {