From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 8 Feb 2012 16:28:42 +0000 (+0100)
Subject: Fix bogus CNIDs in existing meta EA
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=38e94665946a785acecab92ae88f15585ecd546e

Fix bogus CNIDs in existing meta EA
---

diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c
index d372c270..90293a48 100644
--- a/etc/cnid_dbd/cmd_dbd_scanvol.c
+++ b/etc/cnid_dbd/cmd_dbd_scanvol.c
@@ -638,6 +638,7 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi
                 return CNID_INVALID;
             }
             dbd_log( LOGDEBUG, "File without meta EA: \"%s/%s\"", cwdbuf, name);
+            adfile_ok = 1;
         } else {
 
             if (dbd_flags & DBD_FLAGS_FORCE) {
@@ -762,9 +763,7 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi
 
     if ((ad_cnid == 0) && db_cnid) {
         /* in db but zeroID in ad-file, write it to ad-file */
-        if (ADFILE_OK
-            && (volume.v_adouble == AD_VERSION2) 
-            && ! (dbd_flags & DBD_FLAGS_SCAN)) {
+        if (ADFILE_OK && ! (dbd_flags & DBD_FLAGS_SCAN)) {            
             dbd_log(LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file",
                     cwdbuf, name, ntohl(db_cnid));
             ad_init(&ad, &volume);