Fixes

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index b98a7fb477049cab70c0470aef298808c0a2cb2f..e85470242bac887220583a7f08a02b41ce29eba5 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -118,7 +118,7 @@
 #define ADEDLEN_PRIVID          4
 
 #define ADEID_NUM_V2            13
-#define ADEID_NUM_EA            6
+#define ADEID_NUM_EA            5
 #define ADEID_NUM_OSX           2
 
 #define AD_DATASZ2 (AD_HEADER_LEN + ADEDLEN_NAME + ADEDLEN_COMMENT + ADEDLEN_FILEI + \
@@ -132,7 +132,7 @@
 #define AD_DATASZ_EA (AD_HEADER_LEN + (ADEID_NUM_EA * AD_ENTRY_LEN) + ADEDLEN_FINDERI + \
                       ADEDLEN_COMMENT + ADEDLEN_FILEDATESI + ADEDLEN_AFPFILEI + ADEDLEN_PRIVID)
 
-#if AD_DATASZ_EA != 354
+#if AD_DATASZ_EA != 342
 #error bad size for AD_DATASZ_EA
 #endif
 

diff --git a/libatalk/adouble/ad_attr.c b/libatalk/adouble/ad_attr.c
index 47e6f37c515904a4d88241b2c57f519a2e29f6df..796e5e9f25b38ee350c9af6cc8e669eeaa2ed47e 100644 (file)
--- a/libatalk/adouble/ad_attr.c
+++ b/libatalk/adouble/ad_attr.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 #include <atalk/adouble.h>
+#include <atalk/logger.h>
 
 #define FILEIOFF_ATTR 14
 #define AFPFILEIOFF_ATTR 2
@@ -20,26 +21,24 @@ int ad_getattr(const struct adouble *ad, uint16_t *attr)
     uint16_t fflags;
     *attr = 0;
 
-    if (ad->ad_version == AD_VERSION2) {
-        if (ad_getentryoff(ad, ADEID_AFPFILEI)) {
-            memcpy(attr, ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, 2);
-
-            /* Now get opaque flags from FinderInfo */
-            memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
-            if (fflags & htons(FINDERINFO_INVISIBLE))
-                *attr |= htons(ATTRBIT_INVISIBLE);
+    if (ad_getentryoff(ad, ADEID_AFPFILEI)) {
+        memcpy(attr, ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, 2);
+
+        /* Now get opaque flags from FinderInfo */
+        memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
+        if (fflags & htons(FINDERINFO_INVISIBLE))
+            *attr |= htons(ATTRBIT_INVISIBLE);
+        else
+            *attr &= htons(~ATTRBIT_INVISIBLE);
+        /*
+         * This one is tricky, I actually got it wrong the first time:
+         * for directories bit 1<<1 is ATTRBIT_EXPFLDR and is NOT opaque !
+         */
+        if ( ! (ad->ad_adflags & ADFLAGS_DIR)) {
+            if (fflags & htons(FINDERINFO_ISHARED))
+                *attr |= htons(ATTRBIT_MULTIUSER);
             else
-                *attr &= htons(~ATTRBIT_INVISIBLE);
- /*
-   This one is tricky, I actually got it wrong the first time:
-   for directories bit 1<<1 is ATTRBIT_EXPFLDR and is NOT opaque !
- */
-            if ( ! (ad->ad_adflags & ADFLAGS_DIR)) {
-                if (fflags & htons(FINDERINFO_ISHARED))
-                    *attr |= htons(ATTRBIT_MULTIUSER);
-                else
-                    *attr &= htons(~ATTRBIT_MULTIUSER);
-            }
+                *attr &= htons(~ATTRBIT_MULTIUSER);
         }
     }
 
@@ -61,26 +60,24 @@ int ad_setattr(const struct adouble *ad, const uint16_t attribute)
     if (ad->ad_adflags & ADFLAGS_DIR)
         attr &= ~(ATTRBIT_MULTIUSER | ATTRBIT_NOWRITE | ATTRBIT_NOCOPY);
 
-    if (ad->ad_version == AD_VERSION2) {
-        if (ad_getentryoff(ad, ADEID_AFPFILEI) && ad_getentryoff(ad, ADEID_FINDERI)) {
-            memcpy(ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, &attr, sizeof(attr));
+    if (ad_getentryoff(ad, ADEID_AFPFILEI) && ad_getentryoff(ad, ADEID_FINDERI)) {
+        memcpy(ad_entry(ad, ADEID_AFPFILEI) + AFPFILEIOFF_ATTR, &attr, sizeof(attr));
             
-            /* Now set opaque flags in FinderInfo too */
-            memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
-            if (attr & htons(ATTRBIT_INVISIBLE))
-                fflags |= htons(FINDERINFO_INVISIBLE);
-            else
-                fflags &= htons(~FINDERINFO_INVISIBLE);
-
-            /* See above comment in ad_getattr() */
-            if (attr & htons(ATTRBIT_MULTIUSER)) {
-                if ( ! (ad->ad_adflags & ADFLAGS_DIR) )
-                    fflags |= htons(FINDERINFO_ISHARED);
-            } else
-                    fflags &= htons(~FINDERINFO_ISHARED);
-
-            memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &fflags, 2);
-        }
+        /* Now set opaque flags in FinderInfo too */
+        memcpy(&fflags, ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, 2);
+        if (attr & htons(ATTRBIT_INVISIBLE))
+            fflags |= htons(FINDERINFO_INVISIBLE);
+        else
+            fflags &= htons(~FINDERINFO_INVISIBLE);
+
+        /* See above comment in ad_getattr() */
+        if (attr & htons(ATTRBIT_MULTIUSER)) {
+            if ( ! (ad->ad_adflags & ADFLAGS_DIR) )
+                fflags |= htons(FINDERINFO_ISHARED);
+        } else
+            fflags &= htons(~FINDERINFO_ISHARED);
+
+        memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &fflags, 2);
     }
 
     return 0;
@@ -92,12 +89,14 @@ int ad_setattr(const struct adouble *ad, const uint16_t attribute)
  */
 int ad_setid (struct adouble *adp, const dev_t dev, const ino_t ino , const uint32_t id, const cnid_t did, const void *stamp)
 {
-    if ((adp->ad_vers == AD_VERSION2) && (adp->ad_options & ADVOL_CACHE)) {
+    uint32_t tmp;
 
-        /* ad_getid depends on this to detect presence of ALL entries */
-        ad_setentrylen( adp, ADEID_PRIVID, sizeof(id));
-        memcpy(ad_entry( adp, ADEID_PRIVID ), &id, sizeof(id));
+    LOG(log_maxdebug, logtype_afpd, "ad_setid(\"%s\"): CNID: %" PRIu32 "", adp->ad_m_name, ntohl(id));
+    ad_setentrylen( adp, ADEID_PRIVID, sizeof(id));
+    tmp = htonl(id);
+    memcpy(ad_entry( adp, ADEID_PRIVID ), &tmp, sizeof(tmp));
 
+    if (adp->ad_vers == AD_VERSION2) {
         ad_setentrylen( adp, ADEID_PRIVDEV, sizeof(dev_t));
         if ((adp->ad_options & ADVOL_NODEV)) {
             memset(ad_entry( adp, ADEID_PRIVDEV ), 0, sizeof(dev_t));
@@ -113,9 +112,8 @@ int ad_setid (struct adouble *adp, const dev_t dev, const ino_t ino , const uint
 
         ad_setentrylen( adp, ADEID_PRIVSYN, ADEDLEN_PRIVSYN);
         memcpy(ad_entry( adp, ADEID_PRIVSYN ), stamp, ADEDLEN_PRIVSYN);
-        return 1;
     }
-    return 0;
+    return 1;
 }
 
 /* ----------------------------- */
@@ -127,26 +125,25 @@ uint32_t ad_getid (struct adouble *adp, const dev_t st_dev, const ino_t st_ino ,
     cnid_t a_did;
     char   temp[ADEDLEN_PRIVSYN];
 
-    /* look in AD v2 header
-     * note inode and device are opaques and not in network order
-     * only use the ID if adouble is writable for us.
-     */
-    if (adp
-        && (adp->ad_options & ADVOL_CACHE)
-        && (adp->ad_mdp->adf_flags & O_RDWR )
-        && (sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV)) /* One check to ensure ALL values are there */
-        ) {
-        memcpy(&dev, ad_entry(adp, ADEID_PRIVDEV), sizeof(dev_t));
-        memcpy(&ino, ad_entry(adp, ADEID_PRIVINO), sizeof(ino_t));
-        memcpy(temp, ad_entry(adp, ADEID_PRIVSYN), sizeof(temp));
-        memcpy(&a_did, ad_entry(adp, ADEID_DID), sizeof(cnid_t));
-
-        if ( ((adp->ad_options & ADVOL_NODEV) || dev == st_dev)
-             && ino == st_ino
-             && (!did || a_did == did)
-             && (memcmp(stamp, temp, sizeof(temp)) == 0) ) {
+    if (adp) {
+        if ((adp->ad_vers == AD_VERSION2)
+            && (sizeof(dev_t) == ad_getentrylen(adp, ADEID_PRIVDEV))) {
+            memcpy(&dev, ad_entry(adp, ADEID_PRIVDEV), sizeof(dev_t));
+            memcpy(&ino, ad_entry(adp, ADEID_PRIVINO), sizeof(ino_t));
+            memcpy(temp, ad_entry(adp, ADEID_PRIVSYN), sizeof(temp));
+            memcpy(&a_did, ad_entry(adp, ADEID_DID), sizeof(cnid_t));
+
+            if ( ((adp->ad_options & ADVOL_NODEV) || dev == st_dev)
+                 && ino == st_ino
+                 && (!did || a_did == did)
+                 && (memcmp(stamp, temp, sizeof(temp)) == 0) ) {
+                memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
+                return aint;
+            }
+        } else {
             memcpy(&aint, ad_entry(adp, ADEID_PRIVID), sizeof(aint));
-            return aint;
+            LOG(log_maxdebug, logtype_afpd, "ad_getid(\"%s\"): CNID: %" PRIu32 "", adp->ad_m_name, ntohl(aint));
+            return ntohl(aint);
         }
     }
     return 0;

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index d8e2f0445a9a6be1300b8db8e07160bd550a2905..aeb34c29c4c5a8bdef22fcb1bf101eff5b885a4e 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -82,10 +82,11 @@
 #define ADEDOFF_RFORK_V2     (ADEDOFF_PRIVID + ADEDLEN_PRIVID)
 
 /* ad:ea */
-#define ADEDOFF_FINDERI_EA   (AD_HEADER_LEN + ADEID_NUM_EA * AD_ENTRY_LEN)
-#define ADEDOFF_COMMENT_EA   (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
+#define ADEDOFF_FINDERI_EA    (AD_HEADER_LEN + ADEID_NUM_EA * AD_ENTRY_LEN)
+#define ADEDOFF_COMMENT_EA    (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
 #define ADEDOFF_FILEDATESI_EA (ADEDOFF_COMMENT_EA + ADEDLEN_COMMENT)
-#define ADEDOFF_AFPFILEI_EA  (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#define ADEDOFF_AFPFILEI_EA   (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#define ADEDOFF_PRIVID_EA     (ADEDOFF_AFPFILEI_EA + ADEDLEN_AFPFILEI)
 
 /* this is to prevent changing timezones from causing problems with
    localtime volumes. the screw-up is 30 years. we use a delta of 5 years */
@@ -162,7 +163,7 @@ static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = {
     {ADEID_COMMENT,    ADEDOFF_COMMENT_EA,    ADEDLEN_INIT},
     {ADEID_FILEDATESI, ADEDOFF_FILEDATESI_EA, ADEDLEN_FILEDATESI},
     {ADEID_AFPFILEI,   ADEDOFF_AFPFILEI_EA,   ADEDLEN_AFPFILEI},
-    {ADEID_PRIVID,     ADEDOFF_PRIVID,        ADEDLEN_INIT},
+    {ADEID_PRIVID,     ADEDOFF_PRIVID_EA,     ADEDLEN_INIT},
     {0, 0, 0}
 };