Better detection of local (or SMB/NFS) modifications on AFP volumes

diff --git a/NEWS b/NEWS
index 24e56b40c92b693f768a69d572af08fa7d6d76ba..dcfe798c8eb078106b8d6a7681c60eaad2fbe154 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Changes in 2.2.1
        service registration is disabled in the Avahi config
 * FIX: cnid_dbd: increase BerkeleyDB locks and lockobjs
 * FIX: cnid_dbd: implement -d option, deletes CNID db
+* FIX: dbd: better detection of local (or SMB/NFS) modifications on AFP volumes
 * FIX: suse: initscript return better status
 * FIX: Sourcecode distribution: add missing headers
 * FIX: Solaris 10: missing dirfd replacement function

diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c
index daa13e413e441622191606f31ae6085f8ce0ed19..392805588d93902035a432036755e10151932693 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -706,7 +706,7 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi
             ad_flush(&ad);
         }
         else
-            ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, did, stamp);
+            ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, 0, stamp);
 
         if (ad_cnid == 0)
             dbd_log( LOGSTD, "Bad CNID in adouble file of '%s/%s'", cwdbuf, name);

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 792ebe915a4c8dcf7f5085dea7b8e4ce06dbac3f..ac67e4dc27545104ead0bf6dff596103c78d8ad2 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -963,7 +963,7 @@ int dbif_del(DBD *dbd, const int dbi, DBT *key, u_int32_t flags)
                                      flags);
     
     if (ret == DB_NOTFOUND) {
-        LOG(log_info, logtype_cnid, "key not found");
+        LOG(log_debug, logtype_cnid, "key not found");
         return 0;
     }
     if (ret) {