summaryrefslogtreecommitdiffstats
path: root/sftp-server.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-07-17 05:51:32 +0200
committerDamien Miller <djm@mindrot.org>2020-07-17 05:52:46 +0200
commit287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f (patch)
tree316c54cad2d199539429f71b94a087e9982f35e1 /sftp-server.c
parentupstream: Add a '%k' TOKEN that expands to the effective HostKey of (diff)
downloadopenssh-287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f.tar.xz
openssh-287dc6396e0f9cb2393f901816dbd7f2a7dfbb5f.zip
upstream: log error message for process_write() write failures
OpenBSD-Commit-ID: f733d7b3b05e3c68967dc18dfe39b9e8fad29851
Diffstat (limited to 'sftp-server.c')
-rw-r--r--sftp-server.c9
1 files changed, 5 insertions, 4 deletions
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;
}
}