From: didg <didg>
Date: Tue, 16 Feb 2010 02:43:36 +0000 (+0000)
Subject: use the right test for noadouble volumes
X-Git-Tag: before-renameat~23
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=f6a9ab7de99904e2bd4f76ef90769b57a2dd807f

use the right test for noadouble volumes
---

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 915219f5..6b2fcd52 100644
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.134 2010-02-10 14:05:37 franklahm Exp $
+ * $Id: file.c,v 1.135 2010-02-16 02:43:36 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -896,9 +896,9 @@ int setfilparams(struct vol *vol,
          * - change of modification date
          * - UNIX privs (Bug-ID #2863424)
          */
-        if ( (f_bitmap & ~(1<<FILPBIT_MDATE | 1<<FILPBIT_UNIXPR))) {
+        if (!vol_noadouble(vol) && (f_bitmap & ~(1<<FILPBIT_MDATE | 1<<FILPBIT_UNIXPR))) {
             LOG(log_debug, logtype_afpd, "setfilparams: need adouble access");
-            return vol_noadouble(vol) ? AFP_OK : AFPERR_ACCESS;
+            return AFPERR_ACCESS;
         }
         LOG(log_debug, logtype_afpd, "setfilparams: no adouble perms, but only FILPBIT_MDATE and/or FILPBIT_UNIXPR");
         isad = 0;