9Nov06

[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 fb18ada83cf6efb0b66cd25ad1c01ec874bfcaf3..71b988353ffa5a2c4cd5a135debe1029e105de65 100755 (executable)
--- a/bacula/src/lib/parse_conf.c
+++ b/bacula/src/lib/parse_conf.c
@@ -95,6 +95,7 @@ RES_ITEM msgs_items[] = {
    {"syslog",      store_msgs, ITEM(res_msgs), MD_SYSLOG,   0, 0},
    {"mail",        store_msgs, ITEM(res_msgs), MD_MAIL,     0, 0},
    {"mailonerror", store_msgs, ITEM(res_msgs), MD_MAIL_ON_ERROR, 0, 0},
+   {"mailonsuccess", store_msgs, ITEM(res_msgs), MD_MAIL_ON_SUCCESS, 0, 0},
    {"file",        store_msgs, ITEM(res_msgs), MD_FILE,     0, 0},
    {"append",      store_msgs, ITEM(res_msgs), MD_APPEND,   0, 0},
    {"stdout",      store_msgs, ITEM(res_msgs), MD_STDOUT,   0, 0},
@@ -244,6 +245,7 @@ void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass)
       case MD_DIRECTOR:            /* send to Director */
       case MD_MAIL:                /* mail */
       case MD_MAIL_ON_ERROR:       /* mail if Job errors */
+      case MD_MAIL_ON_SUCCESS:     /* mail if Job succeeds */
          if (item->code == MD_OPERATOR) {
             cmd = res_all.res_msgs.operator_cmd;
          } else {
@@ -813,6 +815,9 @@ parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error, int err_type)
             if (token == T_EOL) {
                break;
             }
+            if (token == T_UNICODE_MARK) {
+               break;
+            }
             if (token != T_IDENTIFIER) {
                scan_err1(lc, _("Expected a Resource name identifier, got: %s"), lc->str);
                return 0;
@@ -827,7 +832,7 @@ parse_config(const char *cf, LEX_ERROR_HANDLER *scan_error, int err_type)
                }
             if (state == p_none) {
                scan_err1(lc, _("expected resource name, got: %s"), lc->str);
-          return 0;
+               return 0;
             }
             break;
          case p_resource:
@@ -927,7 +932,7 @@ const char *get_default_configdir()
    }
    return szConfigDir;
 #else
-   return "/etc/bacula";
+   return SYSCONFDIR;
 #endif
 }