Merge branch-2-1

diff --cc etc/afpd/volume.c
index 5d61d69408cdc0513858c3d4ac7140b90ada8adf,7803d4c377ceba1446944de9c4923d0ebe269909..70cec9d8dc8ebd889062d4938637783984e93152
--- 1/etc/afpd/volume.c
--- 2/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@@ -1876,11 -1851,12 +1877,13 @@@ static int volume_openDB(struct vol *vo
                                volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv,
                                volume->v_cnidport ? volume->v_cnidport : Cnid_port);
  
- 
 -    if (!volume->v_cdb) {
 +    if ( ! volume->v_cdb && ! (flags & CNID_FLAG_MEMORY)) {
 +        /* The first attempt failed and it wasn't yet an attempt to open in-memory */
+         LOG(log_error, logtype_afpd, "Can't open volume \"%s\" CNID backend \"%s\" ",
+             volume->v_path, volume->v_cnidscheme);
 -        flags |= CNID_FLAG_MEMORY;
+         LOG(log_error, logtype_afpd, "Reopen volume %s using in memory temporary CNID DB.",
+             volume->v_path);
 +        flags |= CNID_FLAG_MEMORY;
-         LOG(log_error, logtype_afpd, "Reopen volume %s using in memory temporary CNID DB.", volume->v_path);
          volume->v_cdb = cnid_open (volume->v_path, volume->v_umask, "tdb", flags, NULL, NULL);
  #ifdef SERVERTEXT
          /* kill ourself with SIGUSR2 aka msg pending */