This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / src / stored / stored_conf.c

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index 16a370405db79066a80ad728adfe31c97e3f349f..48d714b92cf5fcfbafe18a4496a33e58de9951e5 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -101,6 +101,7 @@ static RES_ITEM dev_items[] = {
    {"alwaysopen",            store_yesno,  ITEM(res_dev.cap_bits), CAP_ALWAYSOPEN, ITEM_DEFAULT, 1},
    {"autochanger",           store_yesno,  ITEM(res_dev.cap_bits), CAP_AUTOCHANGER, ITEM_DEFAULT, 0},
    {"closeonpoll",           store_yesno,  ITEM(res_dev.cap_bits), CAP_CLOSEONPOLL, ITEM_DEFAULT, 0},
+   {"blockpositioning",      store_yesno,  ITEM(res_dev.cap_bits), CAP_POSITIONBLOCKS, ITEM_DEFAULT, 1},
    {"changerdevice",         store_strname,ITEM(res_dev.changer_name), 0, 0, 0},
    {"changercommand",        store_strname,ITEM(res_dev.changer_command), 0, 0, 0},
    {"alertcommand",          store_strname,ITEM(res_dev.alert_command), 0, 0, 0},
@@ -164,19 +165,23 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm
       break;
    case R_STORAGE:
       sendit(sock, "Storage: name=%s SDaddr=%s SDport=%d SDDport=%d HB=%s\n",
-          res->res_store.hdr.name, 
-          NPRT(get_first_address(res->res_store.sdaddrs, buf, sizeof(buf))),
-          get_first_port_host_order(res->res_store.sdaddrs), 
-          get_first_port_host_order(res->res_store.sddaddrs),
-          edit_utime(res->res_store.heartbeat_interval, buf, sizeof(buf)));
-         foreach_dlist(p, res->res_store.sdaddrs) {
-                sendit(sock, "        SDaddr=%s SDport=%d\n", 
-                            p->get_address(buf, sizeof(buf)), p->get_port_host_order());
-         }
-         foreach_dlist(p, res->res_store.sddaddrs) {
-                sendit(sock, "        SDDaddr=%s SDDport=%d\n", 
-                            p->get_address(buf, sizeof(buf)), p->get_port_host_order());
-         }
+            res->res_store.hdr.name, 
+            NPRT(get_first_address(res->res_store.sdaddrs, buf, sizeof(buf))),
+            get_first_port_host_order(res->res_store.sdaddrs), 
+            get_first_port_host_order(res->res_store.sddaddrs),
+            edit_utime(res->res_store.heartbeat_interval, buf, sizeof(buf)));
+      if (res->res_store.sdaddrs) {
+        foreach_dlist(p, res->res_store.sdaddrs) {
+            sendit(sock, "        SDaddr=%s SDport=%d\n", 
+                  p->get_address(buf, sizeof(buf)), p->get_port_host_order());
+        }
+      }
+      if (res->res_store.sddaddrs) {
+        foreach_dlist(p, res->res_store.sddaddrs) {
+            sendit(sock, "        SDDaddr=%s SDDport=%d\n", 
+                  p->get_address(buf, sizeof(buf)), p->get_port_host_order());
+        }
+      }
       break;
    case R_DEVICE:
       sendit(sock, "Device: name=%s MediaType=%s Device=%s\n",