Fix lock

diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c
index 59d5e6072d51905ac5f1f92e21e675008a8f28a4..f915b9961f973bd0a1af4b42af4dcdda473260d6 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@ -407,14 +407,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_prep_upgrade(dbpath))
             goto exit_failure;
         goto exit_success;
@@ -429,6 +424,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
     */