Fix CNID fixup regression, test235. Disable reading of CNID from adouble file

[netatalk.git] / etc / afpd / file.c

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 6cac22b27f0852593f5ca2b46df4a9f737501710..198b155e78899bc6b076189e2655ada4f4bf399f 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.124 2009-11-27 12:37:24 didg Exp $
+ * $Id: file.c,v 1.125 2009-11-27 15:45:40 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -191,16 +191,9 @@ char *set_name(const struct vol *vol, char *data, cnid_t pid, char *name, cnid_t
 
 /* -------------------------- */
 u_int32_t get_id(struct vol *vol, struct adouble *adp,  const struct stat *st,
-             const cnid_t did, char *upath, const int len) 
+                 const cnid_t did, char *upath, const int len) 
 {
-u_int32_t aint = 0;
-
-#if AD_VERSION > AD_VERSION1
-
-    if ((aint = ad_getid(adp, st->st_dev, st->st_ino, did, vol->v_stamp))) {
-       return aint;
-    }
-#endif
+    u_int32_t aint = 0;
 
     if (vol->v_cdb != NULL) {
            aint = cnid_add(vol->v_cdb, st, did, upath, len, aint);
@@ -221,7 +214,6 @@ u_int32_t aint = 0;
                 return CNID_INVALID;
             }
         }
-#if AD_VERSION > AD_VERSION1
         else if (adp ) {
             /* update the ressource fork
              * for a folder adp is always null
@@ -230,7 +222,6 @@ u_int32_t aint = 0;
                 ad_flush(adp);
             }
         }
-#endif    
     }
     return aint;
 }