diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-01-08 08:34:57 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-01-08 08:38:49 +0100 |
| commit | e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0 (patch) | |
| tree | d14b261191ab21c6f8c113684b89be3a7503b8a3 | |
| parent | upstream: add a variant of send_status() that allows overriding the (diff) | |
| download | openssh-e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0.tar.xz openssh-e14940bbec57fc7d3ce0644dbefa35f5a8ec97d0.zip | |
upstream: more idiomatic error messages; spotted by jsg & deraadt
ok jsg & markus
OpenBSD-Commit-ID: 43618c692f3951747b4151c477c7df22afe2bcc8
| -rw-r--r-- | sftp-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-client.c b/sftp-client.c index 251a338c1..fa4a47ccc 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.158 2022/01/01 01:55:30 jsg Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.159 2022/01/08 07:34:57 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -1012,7 +1012,7 @@ do_realpath_expand(struct sftp_conn *conn, const char *path, int expand) if ((r = sshbuf_get_u32(msg, &status)) != 0) fatal_fr(r, "parse status"); - error("Couldn't canonicalize: %s", fx2txt(status)); + error("canonicalize %s: %s", path, fx2txt(status)); sshbuf_free(msg); return NULL; } else if (type != SSH2_FXP_NAME) @@ -1401,7 +1401,7 @@ send_open(struct sftp_conn *conn, const char *path, const char *tag, debug3("Sent %s message SSH2_FXP_OPEN I:%u P:%s M:0x%04x", tag, id, path, openmode); if ((handle = get_handle(conn, id, &handle_len, - "%s open(\"%s\")", tag, path)) == NULL) + "%s open \"%s\"", tag, path)) == NULL) return -1; /* success */ *handlep = handle; |