added WSACleanup(), corrected WSA_Init() (removed #ifdef)

[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 5916143e6d67fd0853c32ab7938f5dc7ac41c3aa..ebdc1a6f63485cb37842b1ae6b6de151138e86dd 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -114,6 +114,10 @@ static RES_ITEM dev_items[] = {
    {"maximumvolumesize",     store_size,   ITEM(res_dev.max_volume_size), 0, 0, 0},
    {"maximumfilesize",       store_size,   ITEM(res_dev.max_file_size), 0, ITEM_DEFAULT, 1000000000},
    {"volumecapacity",        store_size,   ITEM(res_dev.volume_capacity), 0, 0, 0},
+   {"spooldirectory",        store_dir,    ITEM(res_dev.spool_directory), 0, 0, 0},
+   {"maximumspoolsize",      store_size,   ITEM(res_dev.max_spool_size), 0, 0, 0},
+   {"maximumjobspoolsize",   store_size,   ITEM(res_dev.max_job_spool_size), 0, 0, 0},
+   {"driveindex",            store_pint,   ITEM(res_dev.drive_index), 0, 0, 0},
    {NULL, NULL, 0, 0, 0, 0} 
 };
 
@@ -172,6 +176,9 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, char *fmt, ...
         res->res_dev.max_volume_size);
       sendit(sock, "        max_file_size=%" lld " capacity=%" lld "\n",
         res->res_dev.max_file_size, res->res_dev.volume_capacity);
+      sendit(sock, "         spool_directory=%s\n", res->res_dev.spool_directory);
+      sendit(sock, "         max_spool_size=%" lld " max_job_spool_size=%" lld "\n",
+        res->res_dev.max_spool_size, res->res_dev.max_job_spool_size);
       strcpy(buf, "        ");
       if (res->res_dev.cap_bits & CAP_EOF) {
          bstrncat(buf, "CAP_EOF ", sizeof(buf));
@@ -291,6 +298,9 @@ void free_resource(RES *sres, int type)
         if (res->res_dev.changer_command) {
            free(res->res_dev.changer_command);
         }
+        if (res->res_dev.spool_directory) {
+           free(res->res_dev.spool_directory);
+        }
         break;
       case R_MSGS:
         if (res->res_msgs.mail_cmd) {