Merge remote branch 'origin/product-2-2' into develop

[netatalk.git] / etc / cnid_dbd / dbif.c

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 217fdd6d73d7255e6e1a16acc8c9acc3f7ada82b..e0860cbfdf322faf80badf659e9f4e3bf2a75242 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -805,7 +805,12 @@ int dbif_env_remove(const char *path)
     int ret;
     DBD *dbd;
 
-    LOG(log_debug, logtype_cnid, "Reopening BerkeleyDB environment");
+    LOG(log_debug, logtype_cnid, "Trying to remove BerkeleyDB environment");
+
+    if (get_lock(LOCK_EXCL, path) != LOCK_EXCL) {
+        LOG(log_warning, logtype_cnid, "CNID db \"%s\" in use, can't remove BerkeleyDB environment", path);
+        return 0;
+    }
     
     if (NULL == (dbd = dbif_init(path, "cnid2.db")))
         return -1;