From: franklahm <franklahm>
Date: Tue, 5 Jan 2010 15:12:19 +0000 (+0000)
Subject: Fixes for changed ADVOL_NOADOUBLE flag passing
X-Git-Tag: branch-dircache-rewrite-start~32
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=86d7c19c39666bb1843008fc15819c53d8a4c56e

Fixes for changed ADVOL_NOADOUBLE flag passing
---

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index 3bc836c7..8c65d9d8 100644
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.122 2010-01-05 12:06:33 franklahm Exp $
+ * $Id: directory.c,v 1.123 2010-01-05 15:12:19 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -2430,7 +2430,7 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_
     }
 
     ad_init(&ad, vol->v_adouble, vol->v_ad_options);
-    if (ad_open_metadata( ".", vol_noadouble(vol)|ADFLAGS_DIR, O_CREAT, &ad ) < 0)  {
+    if (ad_open_metadata( ".", ADFLAGS_DIR, O_CREAT, &ad ) < 0)  {
         if (vol_noadouble(vol))
             goto createdir_done;
         return( AFPERR_ACCESS );
diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 905c7820..184286c7 100644
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.127 2010-01-05 12:06:33 franklahm Exp $
+ * $Id: file.c,v 1.128 2010-01-05 15:12:19 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -857,7 +857,7 @@ int setfilparams(struct vol *vol,
 
     /* second try with adouble open 
     */
-    if ( ad_open_metadata( upath, vol_noadouble(vol), O_CREAT, adp) < 0) {
+    if ( ad_open_metadata( upath, 0, O_CREAT, adp) < 0) {
         LOG(log_debug, logtype_afpd, "setfilparams: ad_open_metadata error");
         /*
          * For some things, we don't need an adouble header: