Check for DENY READ in FPCopyFile.

[netatalk.git] / libatalk / adouble / ad_lock.c

diff --git a/libatalk/adouble/ad_lock.c b/libatalk/adouble/ad_lock.c
index 0cb1968ddd4628f89c23b4925dce14ddf02826bf..a5d00e9cbabea271f5fbf8ad1a58cde5045f3ddb 100644 (file)
--- a/libatalk/adouble/ad_lock.c
+++ b/libatalk/adouble/ad_lock.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: ad_lock.c,v 1.11.6.4 2004-05-08 22:37:46 didg Exp $
+ * $Id: ad_lock.c,v 1.11.6.4.2.1 2004-12-07 03:24:38 didg Exp $
  *
  * Copyright (c) 1998,1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT for more information.
@@ -403,9 +403,14 @@ int ad_testlock(struct adouble *ad, int eid, const off_t off)
     if ((ad_hfileno(ad) != -1)) {
        adf = &ad->ad_hf;
        lock.l_start = df2off(off);
-       }
-  } else { /* rfork */
-       adf = &ad->ad_hf;
+    }
+  } 
+  else { /* rfork */
+    if ((ad_hfileno(ad) == -1)) {
+        /* there's no resource fork. return no lock */
+        return 0;
+    }
+    adf = &ad->ad_hf;
     lock.l_start = hf2off(off);
   }