File openssh-7.6p1-sftp-client-return-code.patch of Package openssh-testuser.26950

Overview Repositories Revisions Requests Users Attributes Meta

File openssh-7.6p1-sftp-client-return-code.patch of Package openssh-testuser.26950

From e15f878606c30f84d0ee759035d4d5acb1ef414c Mon Sep 17 00:00:00 2001
From: "djm@openbsd.org" <djm@openbsd.org>
Date: Fri, 25 May 2018 04:25:46 +0000
Subject: [PATCH] upstream: Fix return value confusion in several functions
 (readdir,

download and fsync). These should return -1 on error, not a sftp status code.

patch from Petr Cerny in bz#2871

OpenBSD-Commit-ID: 651aa0220ad23c9167d9297a436162d741f97a09
---
 sftp-client.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sftp-client.c b/sftp-client.c
index d49bfaab..9c4a2242 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -651,7 +651,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag,
 		**dir = NULL;
 	}
 
-	return status;
+	return status == SSH2_FX_OK ? 0 : -1;
 }
 
 int
@@ -1001,7 +1001,7 @@ do_fsync(struct sftp_conn *conn, u_char *handle, u_int handle_len)
 	if (status != SSH2_FX_OK)
 		error("Couldn't sync file: %s", fx2txt(status));
 
-	return status;
+	return status == SSH2_FX_OK ? 0 : -1;
 }
 
 #ifdef notyet
@@ -1433,7 +1433,7 @@ do_download(struct sftp_conn *conn, const char *remote_path,
 	sshbuf_free(msg);
 	free(handle);
 
-	return(status);
+	return status == SSH2_FX_OK ? 0 : -1;
 }
 
 static int
-- 
2.38.0

Places

File openssh-7.6p1-sftp-client-return-code.patch of Package openssh-testuser.26950

Places