bugfix for cache id in resource fork.

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 68c2c10ed89530abedb184df780cd10602144236..cfd0dba74502c68f7983a2f0a5f38f93770404d3 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.51.2.7.2.33.2.4 2005-02-10 01:23:16 didg Exp $
+ * $Id: volume.c,v 1.51.2.7.2.33.2.5 2005-04-24 22:26:31 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -632,9 +632,9 @@ static int creatvol(AFPObj *obj, struct passwd *pwd,
 
         volume->v_ad_options = 0;
         if ((volume->v_flags & AFPVOL_NODEV))
-            volume->v_ad_options |= AFPVOL_NODEV;
+            volume->v_ad_options |= ADVOL_NODEV;
         if ((volume->v_flags & AFPVOL_CACHE))
-            volume->v_ad_options |= AFPVOL_CACHE;
+            volume->v_ad_options |= ADVOL_CACHE;
         
         if (options[VOLOPT_PASSWORD].c_value)
             volume->v_password = strdup(options[VOLOPT_PASSWORD].c_value);

diff --git a/libatalk/adouble/ad_attr.c b/libatalk/adouble/ad_attr.c
index f4787601a1be862d2c90fd00c389346414b60eda..9eb2af12b58ab3e4785d88f5e959b41c69ab16ff 100644 (file)
--- a/libatalk/adouble/ad_attr.c
+++ b/libatalk/adouble/ad_attr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_attr.c,v 1.4.8.7.2.1 2005-02-10 01:23:17 didg Exp $
+ * $Id: ad_attr.c,v 1.4.8.7.2.2 2005-04-24 22:26:32 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -115,7 +115,7 @@ char   temp[ADEDLEN_PRIVSYN];
     ) {
         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(stamp));
+        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)