ifdef off conio.c if not configured -- should not be necessary

[bacula/bacula] / bacula / src / console / console_conf.c

diff --git a/bacula/src/console/console_conf.c b/bacula/src/console/console_conf.c
index f8a79503c01119b043a40be94d6c66a03e5ae78a..f69975c2d2917845019c36040c7b0dcbdafa60f6 100644 (file)
--- a/bacula/src/console/console_conf.c
+++ b/bacula/src/console/console_conf.c
@@ -71,6 +71,7 @@ static struct res_items cons_items[] = {
    {"description", store_str,      ITEM(res_cons.hdr.desc), 0, 0, 0},
    {"rcfile",      store_dir,      ITEM(res_cons.rc_file), 0, 0, 0},
    {"historyfile", store_dir,      ITEM(res_cons.hist_file), 0, 0, 0},
+   {"requiressl",  store_yesno,    ITEM(res_cons.require_ssl), 1, ITEM_DEFAULT, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
@@ -79,9 +80,10 @@ static struct res_items cons_items[] = {
 static struct res_items dir_items[] = {
    {"name",        store_name,     ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,      ITEM(res_dir.hdr.desc), 0, 0, 0},
-   {"dirport",     store_int,      ITEM(res_dir.DIRport),  0, ITEM_REQUIRED, 0},
+   {"dirport",     store_int,      ITEM(res_dir.DIRport),  0, ITEM_DEFAULT, 9101},
    {"address",     store_str,      ITEM(res_dir.address),  0, ITEM_REQUIRED, 0},
    {"password",    store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
+   {"enablessl",   store_yesno,    ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
@@ -147,10 +149,12 @@ void free_resource(int type)
 
    /* common stuff -- free the resource name */
    nres = (RES *)res->res_dir.hdr.next;
-   if (res->res_dir.hdr.name)
+   if (res->res_dir.hdr.name) {
       free(res->res_dir.hdr.name);
-   if (res->res_dir.hdr.desc)
+   }
+   if (res->res_dir.hdr.desc) {
       free(res->res_dir.hdr.desc);
+   }
 
    switch (type) {
       case R_CONSOLE:
@@ -250,9 +254,13 @@ void save_resource(int type, struct res_items *items, int pass)
         resources[rindex].res_head = (RES *)res; /* store first entry */
       } else {
         RES *next;
-        /* Add new res to end of chain */
-        for (next=resources[rindex].res_head; next->next; next=next->next)
-           { }
+        for (next=resources[rindex].res_head; next->next; next=next->next) {
+           if (strcmp(next->name, res->res_dir.hdr.name) == 0) {
+              Emsg2(M_ERROR_TERM, 0,
+                  _("Attempt to define second %s resource named \"%s\" is not permitted.\n"),
+                 resources[rindex].name, res->res_dir.hdr.name);
+           }
+        }
         next->next = (RES *)res;
          Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
               res->res_dir.hdr.name);