Don't require default level

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@959 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index f741addf9eca54729546ad5700c9801835278e5c..3429d2ff02d881abb83d38364edaabcd21e04873 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -191,7 +191,7 @@ struct res_items job_items[] = {
    {"name",      store_name,    ITEM(res_job.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,   ITEM(res_job.hdr.desc), 0, 0, 0},
    {"type",      store_jobtype, ITEM(res_job.JobType),  0, ITEM_REQUIRED, 0},
-   {"level",     store_level,   ITEM(res_job.level),    0, ITEM_REQUIRED, 0},
+   {"level",     store_level,   ITEM(res_job.level),    0, 0, 0},
    {"messages",  store_res,     ITEM(res_job.messages), R_MSGS, ITEM_REQUIRED, 0},
    {"storage",   store_res,     ITEM(res_job.storage),  R_STORAGE, ITEM_REQUIRED, 0},
    {"pool",      store_res,     ITEM(res_job.pool),     R_POOL, ITEM_REQUIRED, 0},

diff --git a/bacula/src/tools/bsmtp.c b/bacula/src/tools/bsmtp.c
index a9bb42b0200c64c633c785bd14e5a00a47ea754c..f8fa4bf5d34add1cf459d9068dc2e64c264fd669 100644 (file)
--- a/bacula/src/tools/bsmtp.c
+++ b/bacula/src/tools/bsmtp.c
@@ -251,7 +251,7 @@ hp:
       exit(1);
    }
    if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-      Pmsg1(0, "Fatal connect error: ERR=%s\n", strerror(errno));
+      Pmsg2(0, "Fatal connect error to %s: ERR=%s\n", mailhost, strerror(errno));
       exit(1);
    }
    Dmsg0(20, "Connected\n");