summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2007-01-22 11:32:50 +0000
committerdjm <djm@openbsd.org>2007-01-22 11:32:50 +0000
commit3830a274f7423b0d708688dc860c0186e220be96 (patch)
treea79409ae7ba387ec24fe55561051ea85741d21a7
parentuse a more sensible value for -K example, from tedu@ (diff)
downloadwireguard-openbsd-3830a274f7423b0d708688dc860c0186e220be96.tar.xz
wireguard-openbsd-3830a274f7423b0d708688dc860c0186e220be96.zip
return error from do_upload() when a write fails. fixes bz#1252: zero
exit status from sftp when uploading to a full device. report from jirkat AT atlas.cz; ok dtucker@
-rw-r--r--usr.bin/ssh/sftp-client.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index 6595e64e56a..78f364d0ce6 100644
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.76 2007/01/22 11:32:50 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
*
@@ -1130,6 +1130,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
close(local_fd);
xfree(data);
xfree(ack);
+ status = -1;
goto done;
}
debug3("In write loop, ack for %u %u bytes at %llu",