From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 17 Jul 2020 03:51:32 +0000 (+0000)
Subject: upstream: log error message for process_write() write failures
X-Git-Tag: V_8_4_P1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f;p=thirdparty%2Fopenssh-portable.git

upstream: log error message for process_write() write failures

OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
---

diff --git a/sftp-server.c b/sftp-server.c
index b1d8c88cb..55386fa9a 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.118 2020/06/22 05:52:05 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.119 2020/07/17 03:51:32 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -799,18 +799,19 @@ process_write(u_int32_t id)
 		if (!(handle_to_flags(handle) & O_APPEND) &&
 				lseek(fd, off, SEEK_SET) == -1) {
 			status = errno_to_portable(errno);
-			error("process_write: seek failed");
+			error("%s: seek failed", __func__);
 		} else {
 /* XXX ATOMICIO ? */
 			ret = write(fd, data, len);
 			if (ret == -1) {
-				error("process_write: write failed");
+				error("%s: write: %s", __func__,
+				    strerror(errno));
 				status = errno_to_portable(errno);
 			} else if ((size_t)ret == len) {
 				status = SSH2_FX_OK;
 				handle_update_write(handle, ret);
 			} else {
-				debug2("nothing at all written");
+				debug2("%s: nothing at all written", __func__);
 				status = SSH2_FX_FAILURE;
 			}
 		}