diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-05-25 04:25:46 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-05-25 14:27:50 +1000 |
commit | f6a59a22b0c157c4c4e5fd7232f868138223be64 (patch) | |
tree | bd560b031e9c3c5450d72b739bc14d92086a5b21 | |
parent | 1da5934b860ac0378d52d3035b22b6670f6a967e (diff) |
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
-rw-r--r-- | sftp-client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sftp-client.c b/sftp-client.c index 0b53a2e68..dc4d8c4e0 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.128 2017/11/28 21:10:22 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.129 2018/05/25 04:25:46 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -669,7 +669,7 @@ do_lsreaddir(struct sftp_conn *conn, const char *path, int print_flag, | |||
669 | **dir = NULL; | 669 | **dir = NULL; |
670 | } | 670 | } |
671 | 671 | ||
672 | return status; | 672 | return status == SSH2_FX_OK ? 0 : -1; |
673 | } | 673 | } |
674 | 674 | ||
675 | int | 675 | int |
@@ -1019,7 +1019,7 @@ do_fsync(struct sftp_conn *conn, u_char *handle, u_int handle_len) | |||
1019 | if (status != SSH2_FX_OK) | 1019 | if (status != SSH2_FX_OK) |
1020 | error("Couldn't sync file: %s", fx2txt(status)); | 1020 | error("Couldn't sync file: %s", fx2txt(status)); |
1021 | 1021 | ||
1022 | return status; | 1022 | return status == SSH2_FX_OK ? 0 : -1; |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | #ifdef notyet | 1025 | #ifdef notyet |
@@ -1451,7 +1451,7 @@ do_download(struct sftp_conn *conn, const char *remote_path, | |||
1451 | sshbuf_free(msg); | 1451 | sshbuf_free(msg); |
1452 | free(handle); | 1452 | free(handle); |
1453 | 1453 | ||
1454 | return(status); | 1454 | return status == SSH2_FX_OK ? 0 : -1; |
1455 | } | 1455 | } |
1456 | 1456 | ||
1457 | static int | 1457 | static int |