Real fix of bug #1897

[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 a9fc44da5df02288e5bee45849b790a2694c0e6f..f659d16b3bbeadb84dd7d8cd77996ff4e3cb4cd8 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -226,9 +226,9 @@ static s_kw dev_types[] = {
  */
 static void store_devtype(LEX *lc, RES_ITEM *item, int index, int pass)
 {
-   int token, i;
+   int i;
 
-   token = lex_get_token(lc, T_NAME);
+   lex_get_token(lc, T_NAME);
    /* Store the label pass 2 so that type is defined */
    for (i=0; dev_types[i].name; i++) {
       if (strcasecmp(lc->str, dev_types[i].name) == 0) {
@@ -475,6 +475,9 @@ void free_resource(RES *sres, int type)
       if (res->res_store.subsys_directory) {
          free(res->res_store.subsys_directory);
       }
+      if (res->res_store.plugin_directory) {
+         free(res->res_store.plugin_directory);
+      }
       if (res->res_store.scripts_directory) {
          free(res->res_store.scripts_directory);
       }
@@ -630,7 +633,9 @@ void save_resource(int type, RES_ITEM *items, int pass)
          foreach_alist(dev, res->res_changer.device) {
             dev->changer_res = (AUTOCHANGER *)&res->res_changer;
          }
-         if ((errstat = rwl_init(&res->res_changer.changer_lock)) != 0) {
+         if ((errstat = rwl_init(&res->res_changer.changer_lock, 
+                                 PRIO_SD_ACH_ACCESS)) != 0)
+         {
             berrno be;
             Jmsg1(NULL, M_ERROR_TERM, 0, _("Unable to init lock: ERR=%s\n"), 
                   be.bstrerror(errstat));