Merge branch 2-1

diff --cc NEWS
Simple merge

diff --cc etc/cnid_dbd/cmd_dbd.c
Simple merge

diff --cc etc/cnid_dbd/cmd_dbd.h
Simple merge

diff --cc etc/cnid_dbd/cmd_dbd_scanvol.c
index ec8c469469abf27a354ef07fe025dbdbf9f3b720,fbb0b7dbf15a60ff3eb8d1c3a8adfcebdd777979..b73ef55613ae9aa345c524ac96f83124348de591
--- 1/etc/cnid_dbd/cmd_dbd_scanvol.c
--- 2/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@@ -1130,9 -1150,10 +1157,10 @@@ int cmd_dbd_scanvol(DBD *dbd_ref, struc
  {
      int ret = 0;
      struct db_param db_param = { 0 };
+     const char *tmpdb_path = NULL;
  
      /* Set cachesize for in-memory rebuild db */
 -    db_param.cachesize = 128 * 1024 * 1024; /* 128 MB */
 +    db_param.cachesize = 256 * 1024 * 1024; /* 128 MB */
  
      /* Make it accessible for all funcs */
      dbd = dbd_ref;