]> arthur.barton.de Git - netatalk.git/commitdiff
Fix regression introduced by f422a450f02e1bc95a26a6b10f1446cc291d5007
authorFrank Lahm <franklahm@googlemail.com>
Sat, 19 Nov 2011 15:43:05 +0000 (16:43 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 19 Nov 2011 15:43:05 +0000 (16:43 +0100)
etc/afpd/fork.c

index 2e235888590e5eed2ebe143ccb91b732f8361bf4..aff46d5337c31a55aca705e0329d1e31dc768239 100644 (file)
@@ -845,8 +845,6 @@ static int read_fork(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, si
     u_int16_t          ofrefnum;
     u_char             nlmask, nlchar;
 
-    *rbuflen = 0;
-
     ibuf += 2;
     memcpy(&ofrefnum, ibuf, sizeof( ofrefnum ));
     ibuf += sizeof( u_short );
@@ -902,8 +900,8 @@ static int read_fork(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, si
         goto afp_read_err;
     }
 
-#ifndef WITH_SENDFILE
     *rbuflen = MIN(reqcount, *rbuflen);
+#ifndef WITH_SENDFILE
     err = read_file(ofork, eid, offset, nlmask, nlchar, rbuf, rbuflen, xlate);
     if (err < 0)
         goto afp_read_done;