]> arthur.barton.de Git - netatalk.git/commitdiff
read_file() clobbered the AFP error code
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 19 Mar 2013 11:18:34 +0000 (12:18 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 19 Mar 2013 12:27:33 +0000 (13:27 +0100)
etc/afpd/fork.c

index 577cd471bd146506d416d6776f8e260ccd0c7e44..ea6cbeec2a6245ff6b5260c473db99c48d08522f 100644 (file)
@@ -839,9 +839,11 @@ static int read_fork(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, si
 
     *rbuflen = MIN(reqcount, *rbuflen);
 
-    err = read_file(ofork, eid, offset, rbuf, rbuflen);
-    if (err < 0)
+    cc = read_file(ofork, eid, offset, rbuf, rbuflen);
+    if (cc < 0) {
+        err = cc;
         goto afp_read_done;
+    }
 
     LOG(log_debug, logtype_afpd,
         "afp_read(name: \"%s\", offset: %jd, reqcount: %jd): got %jd bytes from file",