remove a debug quota log output

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

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index e60dd488826dc1a11bf547b71bd2e3a7958388e1..d41e1252f45d2bb32d43923ffa88d50b3055bb49 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.98 2005-05-25 18:32:04 didg Exp $
+ * $Id: file.c,v 1.100 2006-09-15 00:02:56 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1446,21 +1446,23 @@ struct adouble *adp;
     ad_close( adp, adflags );
 
     if (ad_close( &add, adflags ) <0) {
+        if (!ret_err) {
+            ret_err = errno;
+        }
         deletefile(d_vol, dst, 0);
-        ret_err = errno;
         goto done;
     } 
 
     if (!ret_err && newname && (adflags & ADFLAGS_HF)) {
         /* set the new name in the resource fork */
        ad_init(&add, d_vol->v_adouble, d_vol->v_ad_options);
-       if (ad_open(dst , ADFLAGS_HF | noadouble, O_RDWR, 0666, &add) < 0) {
+       if (ad_open_metadata(dst , noadouble, 0, &add) < 0) {
            ret_err = errno;
        }
        else {
             ad_setname(&add, newname);
-            ad_flush( &add, ADFLAGS_HF );
-            if (ad_close( &add, ADFLAGS_HF ) <0) {
+            ad_flush_metadata( &add);
+            if (ad_close_metadata( &add)) {
                 ret_err = errno;
             }
         }
@@ -1472,12 +1474,7 @@ struct adouble *adp;
     else if (stat_result == 0) {
         /* set dest modification date to src date */
         struct utimbuf ut;
-#if 0        
-        if (vol_unix_priv(d_vol)) {
-            /* unix priv, use source priv. XXX should be done in ad_open? */
-            setfilunixmode(d_vol, dst, st.st_mode);
-        }
-#endif        
+
        ut.actime = ut.modtime = st.st_mtime;
        utime(dst, &ut);
        /* FIXME netatalk doesn't use resource fork file date