- Fix seg fault if user labels a drive directory bug #513

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

diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h
index 1bb1684b709854531bb913aec6b8087f76e31f91..af81738e579bc1e04a567797c07736a1c435d36f 100644 (file)
--- a/bacula/src/lib/parse_conf.h
+++ b/bacula/src/lib/parse_conf.h
@@ -2,7 +2,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2005 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -41,7 +41,7 @@ struct RES_ITEM {
 /* For storing name_addr items in res_items table */
 #define ITEM(x) ((void **)&res_all.x)
 
-#define MAX_RES_ITEMS 50             /* maximum resource items per RES */
+#define MAX_RES_ITEMS 70             /* maximum resource items per RES */
 
 /* This is the universal header that is
  * at the beginning of every resource
@@ -96,7 +96,7 @@ union CURES {
 
 
 /* Configuration routines */
-int    parse_config(const char *cf, int exit_on_error = 1);
+int   parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error = NULL);
 void   free_config_resources(void);
 RES   **save_config_resources(void);
 RES   **new_res_head();
@@ -130,6 +130,7 @@ void store_name(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_strname(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_res(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_alist_res(LEX *lc, RES_ITEM *item, int index, int pass);
+void store_alist_str(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_int(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_pint(LEX *lc, RES_ITEM *item, int index, int pass);
 void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass);