From: Frank Lahm <franklahm@googlemail.com>
Date: Sat, 16 Apr 2011 09:57:26 +0000 (+0200)
Subject: Merge branch 2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=5825df1c826101269dccd558ac9ac85c0dcd4e36

Merge branch 2-1
---

5825df1c826101269dccd558ac9ac85c0dcd4e36
diff --cc etc/cnid_dbd/cmd_dbd.c
index 532b7b8a,f915b996..a643ef05
--- a/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) {
+         lockfd = get_lock(dbpath);
 -        if (dbif_prep_upgrade(dbpath))
 +        if (dbif_env_remove(dbpath))
              goto exit_failure;
          goto exit_success;
      }