Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / dird / run_conf.c

diff --git a/bacula/src/dird/run_conf.c b/bacula/src/dird/run_conf.c
index e96882d76d338d18609176d2658bc97ad4bbd649..9d21eb9a39e83b7b23d8bda2e4733109ad0a07b9 100644 (file)
--- a/bacula/src/dird/run_conf.c
+++ b/bacula/src/dird/run_conf.c
@@ -1,24 +1,28 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  *
  *  Configuration parser for Director Run Configuration
  *   directives, which are part of the Schedule Resource
  *
- *     Written by Kern Sibbald, May MM
+ *     Kern Sibbald, May MM
  *
  */
 
@@ -148,19 +152,19 @@ static void set_defaults()
  *    name              token
  */
 s_kw RunFields[] = {
-   {"pool",              'P'},
-   {"fullpool",          'f'},
-   {"incrementalpool",   'i'},
-   {"differentialpool",  'd'},
-   {"level",             'L'},
-   {"storage",           'S'},
-   {"messages",          'M'},
-   {"priority",          'p'},
-   {"spooldata",         's'},
+   {"Pool",              'P'},
+   {"FullPool",          'f'},
+   {"IncrementalPool",   'i'},
+   {"DifferentialPool",  'd'},
+   {"Level",             'L'},
+   {"Storage",           'S'},
+   {"Messages",          'M'},
+   {"Priority",          'p'},
+   {"SpoolData",         's'},
    {"writepartafterjob", 'W'},
-   {"maxrunschedtime",   'm'},
-   {"accurate",          'a'},
-   {"nextpool",          'N'},
+   {"MaxRunSchedTime",   'm'},
+   {"Accurate",          'a'},
+   {"NextPool",          'N'},
    {NULL,                 0}
 };
 
@@ -513,6 +517,7 @@ void store_run(LEX *lc, RES_ITEM *item, int index, int pass)
             clear_bits(0, 30, lrun.mday);
             have_mday = true;
          }
+         lrun.last_day_set = true;
          set_bit(31, lrun.mday);   /* day 32 => last day of month */
          break;
       case s_range: