Merge branch 2-1

diff --cc etc/cnid_dbd/cmd_dbd.c
index 532b7b8a6bd3b67d3966e374185ea83f02e91b04,f915b9961f973bd0a1af4b42af4dcdda473260d6..a643ef0510bd8eedee0a4840264ae3af16b62a65
--- 1/etc/cnid_dbd/cmd_dbd.c
--- 2/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@@ -422,15 -407,10 +422,10 @@@ int main(int argc, char **argv
          close(dbdirfd);
      }
  
-     /* 
-        Before we do anything else, check if there is an instance of cnid_dbd
-        running already and silently exit if yes.
-     */
-     lockfd = get_lock(dbpath);
- 
      /* Prepare upgrade ? */
      if (prep_upgrade) {
 -        if (dbif_prep_upgrade(dbpath))
+         lockfd = get_lock(dbpath);
 +        if (dbif_env_remove(dbpath))
              goto exit_failure;
          goto exit_success;
      }