From 15ccbddc6db99689548b518160ad26e1bdc37261 Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Fri, 17 Oct 2014 13:24:23 +0800 Subject: Revert "tftp-hpa: bug fix on empty file put error" This reverts commit b2eb21a5fbcb065e84ed582e87de21bdc3082f00. It make 3d8520a0b411[tftp-hpa: add error check for disk filled up] unable to work Signed-off-by: Joe MacDonald --- .../tftp-hpa-bug-fix-on-empty-file-put-error.patch | 33 ---------------------- .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 - 2 files changed, 34 deletions(-) delete mode 100644 meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch (limited to 'meta-networking') diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch b/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch deleted file mode 100644 index aa29d9ce1c..0000000000 --- a/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-empty-file-put-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -tftp-hpa: bug fix on empty file put error - -With the feature that checking the disk filled up, the return value of -function write_behind was checked and used to detect the disk status. -While for empty file, without data being written, this function will -return -1 thus the disk filled up error was miss-raised. Fix it. - -Upstream-Status: pending - -Signed-off-by: Zhang Xiao ---- - tftpd/tftpd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) ---- a/tftpd/tftpd.c -+++ b/tftpd/tftpd.c -@@ -1692,7 +1692,7 @@ static void tftp_recvfile(const struct f - syslog(LOG_WARNING, "tftpd: write(ack): %m"); - goto abort; - } -- if(write_behind(file, pf->f_convert) < 0) { -+ if(write_behind(file, pf->f_convert) < -1) { - nak(ENOSPACE, NULL); - (void)fclose(file); - goto abort; -@@ -1727,7 +1727,7 @@ static void tftp_recvfile(const struct f - goto abort; - } - } while (size == segsize); -- if(write_behind(file, pf->f_convert) < 0) { -+ if(write_behind(file, pf->f_convert) < -1) { - nak(ENOSPACE, NULL); - (void)fclose(file); - goto abort; diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index e58a4b1851..19517473fe 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -25,7 +25,6 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://init \ file://add-error-check-for-disk-filled-up.patch \ file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ - file://tftp-hpa-bug-fix-on-empty-file-put-error.patch \ " SRC_URI[md5sum] = "46c9bd20bbffa62f79c958c7b99aac21" -- cgit 1.2.3-korg