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

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

diff --git a/etc/cnid_dbd/cmd_dbd.c b/etc/cnid_dbd/cmd_dbd.c
index 7a1614f7ac4c4f549101e4d9ae85a01489c56a89..8f8b734216fb2a9413d1ffde668d2ff5fb40b5f1 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.c
+++ b/etc/cnid_dbd/cmd_dbd.c
@@ -251,18 +251,18 @@ int main(int argc, char **argv)
     /* Setup signal handling */
     set_signal();
 
+    /* Load config */
+    if (afp_config_parse(&obj, "dbd") != 0) {
+        dbd_log( LOGSTD, "Couldn't load afp.conf");
+        exit(EXIT_FAILURE);
+    }
+
     /* Setup logging. Should be portable among *NIXes */
     if (!verbose)
         setuplog("default:info", "/dev/tty");
     else
         setuplog("default:debug", "/dev/tty");
 
-    /* Load config */
-    if (afp_config_parse(&obj) != 0) {
-        dbd_log( LOGSTD, "Couldn't load afp.conf");
-        exit(EXIT_FAILURE);
-    }
-
     if (load_volumes(&obj, NULL) != 0) {
         dbd_log( LOGSTD, "Couldn't load volumes");
         exit(EXIT_FAILURE);
@@ -342,6 +342,7 @@ int main(int argc, char **argv)
     if ((db_locked = get_lock(LOCK_EXCL, dbpath)) == -1)
         goto exit_noenv;
     if (db_locked != LOCK_EXCL) {
+        dbd_log(LOGDEBUG, "Database is in use, acquiring shared lock");
         /* Couldn't get exclusive lock, try shared lock if -e wasn't requested */
         if (exclusive) {
             dbd_log(LOGSTD, "Database is in use and exlusive was requested");