From aabcb6c09a4606d833a5793188502fcd08595493 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 19 Mar 2013 12:18:34 +0100 Subject: [PATCH] read_file() clobbered the AFP error code --- etc/afpd/fork.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c index 577cd471..ea6cbeec 100644 --- a/etc/afpd/fork.c +++ b/etc/afpd/fork.c @@ -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", -- 2.39.2