Merge branch 2-1

diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c
index 532b7b8a6bd3b67d3966e374185ea83f02e91b04..a643ef0510bd8eedee0a4840264ae3af16b62a65 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@ -422,14 +422,9 @@ 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) {
+        lockfd = get_lock(dbpath);
         if (dbif_env_remove(dbpath))
             goto exit_failure;
         goto exit_success;
@@ -448,6 +443,12 @@ int main(int argc, char **argv)
         dbd_log( LOGDEBUG, "Removed old database.");
     }
 
+    /* 
+       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);
+
     /* 
        Lets start with the BerkeleyDB stuff
     */