Server address binding + bscan updates -- see kes25Sep02

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

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 79b910fd70bf58a93352008e78730e52d2ba8660..1fd62959b6c6bd47ad6a9def041c6d86d91c3d9e 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -87,8 +87,9 @@ 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},
    {"messages",    store_res,      ITEM(res_dir.messages), R_MSGS, 0, 0},
-   {"dirport",     store_pint,     ITEM(res_dir.DIRport),  0, ITEM_REQUIRED, 0},
-   {"queryfile",   store_dir,      ITEM(res_dir.query_file), 0, 0, 0},
+   {"dirport",     store_pint,     ITEM(res_dir.DIRport),  0, ITEM_DEFAULT, 9101},
+   {"diraddress",  store_str,      ITEM(res_dir.DIRaddr),  0, 0, 0},
+   {"queryfile",   store_dir,      ITEM(res_dir.query_file), 0, ITEM_REQUIRED, 0},
    {"workingdirectory", store_dir, ITEM(res_dir.working_directory), 0, ITEM_REQUIRED, 0},
    {"piddirectory", store_dir,     ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0},
    {"subsysdirectory", store_dir,  ITEM(res_dir.subsys_directory), 0, ITEM_REQUIRED, 0},
@@ -109,7 +110,7 @@ static struct res_items cli_items[] = {
    {"name",     store_name,       ITEM(res_client.hdr.name), 0, ITEM_REQUIRED, 0},
    {"description", store_str,     ITEM(res_client.hdr.desc), 0, 0, 0},
    {"address",  store_str,        ITEM(res_client.address),  0, ITEM_REQUIRED, 0},
-   {"fdport",   store_pint,       ITEM(res_client.FDport),   0, ITEM_REQUIRED, 0},
+   {"fdport",   store_pint,       ITEM(res_client.FDport),   0, ITEM_DEFAULT, 9102},
    {"password", store_password,   ITEM(res_client.password), 0, ITEM_REQUIRED, 0},
    {"catalog",  store_res,        ITEM(res_client.catalog),  R_CATALOG, 0, 0},
    {"fileretention", store_time,  ITEM(res_client.FileRetention), 0, ITEM_DEFAULT, 60*60*24*60},
@@ -125,12 +126,13 @@ static struct res_items cli_items[] = {
 static struct res_items store_items[] = {
    {"name",      store_name,     ITEM(res_store.hdr.name),   0, ITEM_REQUIRED, 0},
    {"description", store_str,    ITEM(res_store.hdr.desc),   0, 0, 0},
-   {"sdport",    store_pint,     ITEM(res_store.SDport),     0, ITEM_REQUIRED, 0},
+   {"sdport",    store_pint,     ITEM(res_store.SDport),     0, ITEM_DEFAULT, 9103},
    {"sddport",   store_pint,     ITEM(res_store.SDDport),    0, 0, 0}, /* deprecated */
    {"address",   store_str,      ITEM(res_store.address),    0, ITEM_REQUIRED, 0},
    {"password",  store_password, ITEM(res_store.password),   0, ITEM_REQUIRED, 0},
    {"device",    store_strname,  ITEM(res_store.dev_name),   0, ITEM_REQUIRED, 0},
    {"mediatype", store_strname,  ITEM(res_store.media_type), 0, ITEM_REQUIRED, 0},
+   {"autochanger", store_yesno,  ITEM(res_store.autochanger), 1, ITEM_DEFAULT, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
@@ -180,6 +182,7 @@ static struct res_items job_items[] = {
    {"runbeforejob", store_str,  ITEM(res_job.RunBeforeJob), 0, 0, 0},
    {"runafterjob",  store_str,  ITEM(res_job.RunAfterJob),  0, 0, 0},
    {"spoolattributes", store_yesno, ITEM(res_job.SpoolAttributes), 1, ITEM_DEFAULT, 0},
+   {"writebootstrap", store_dir, ITEM(res_job.WriteBootstrap), 0, 0, 0},
    {NULL, NULL, NULL, 0, 0, 0} 
 };
 
@@ -485,6 +488,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, char *fmt, ...
         if (res->res_job.RunAfterJob) {
             sendit(sock, "  --> RunAfter=%s\n", NPRT(res->res_job.RunAfterJob));
         }
+        if (res->res_job.WriteBootstrap) {
+            sendit(sock, "  --> WriteBootstrap=%s\n", NPRT(res->res_job.WriteBootstrap));
+        }
         if (res->res_job.storage) {
             sendit(sock, "  --> ");
            dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
@@ -637,22 +643,32 @@ void free_resource(int type)
 
    switch (type) {
       case R_DIRECTOR:
-        if (res->res_dir.working_directory)
+        if (res->res_dir.working_directory) {
            free(res->res_dir.working_directory);
-        if (res->res_dir.pid_directory)
+        }
+        if (res->res_dir.pid_directory) {
            free(res->res_dir.pid_directory);
-        if (res->res_dir.subsys_directory)
+        }
+        if (res->res_dir.subsys_directory) {
            free(res->res_dir.subsys_directory);
-        if (res->res_dir.password)
+        }
+        if (res->res_dir.password) {
            free(res->res_dir.password);
-        if (res->res_dir.query_file)
+        }
+        if (res->res_dir.query_file) {
            free(res->res_dir.query_file);
+        }
+        if (res->res_dir.DIRaddr) {
+           free(res->res_dir.DIRaddr);
+        }
         break;
       case R_CLIENT:
-        if (res->res_client.address)
+        if (res->res_client.address) {
            free(res->res_client.address);
-        if (res->res_client.password)
+        }
+        if (res->res_client.password) {
            free(res->res_client.password);
+        }
         break;
       case R_STORAGE:
         if (res->res_store.address)
@@ -712,6 +728,9 @@ void free_resource(int type)
         if (res->res_job.RestoreBootstrap) {
            free(res->res_job.RestoreBootstrap);
         }
+        if (res->res_job.WriteBootstrap) {
+           free(res->res_job.WriteBootstrap);
+        }
         if (res->res_job.RunBeforeJob) {
            free(res->res_job.RunBeforeJob);
         }