diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-01-08 07:33:54 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-01-08 18:38:49 +1100 |
| commit | 9acddcd5918c623f7ebf454520ffe946a8f15e90 (patch) | |
| tree | ac687759292e1b8678f733d3dc9f3b3b392fb135 /sftp-server.c | |
| parent | 961411337719d4cd78f1ab33e4ac549f3fa22f50 (diff) | |
| download | openssh-git-9acddcd5918c623f7ebf454520ffe946a8f15e90.tar.gz | |
upstream: add a variant of send_status() that allows overriding the
default, generic error message. feedback/ok markus & jsg
OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
Diffstat (limited to 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sftp-server.c b/sftp-server.c index 05cd4ebc..a3d1dc2d 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.135 2022/01/01 01:55:30 jsg Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.136 2022/01/08 07:33:54 djm Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -536,7 +536,7 @@ status_to_message(u_int32_t status) } static void -send_status(u_int32_t id, u_int32_t status) +send_status_errmsg(u_int32_t id, u_int32_t status, const char *errmsg) { struct sshbuf *msg; int r; @@ -552,14 +552,21 @@ send_status(u_int32_t id, u_int32_t status) (r = sshbuf_put_u32(msg, status)) != 0) fatal_fr(r, "compose"); if (version >= 3) { - if ((r = sshbuf_put_cstring(msg, - status_to_message(status))) != 0 || + if ((r = sshbuf_put_cstring(msg, errmsg == NULL ? + status_to_message(status) : errmsg)) != 0 || (r = sshbuf_put_cstring(msg, "")) != 0) fatal_fr(r, "compose message"); } send_msg(msg); sshbuf_free(msg); } + +static void +send_status(u_int32_t id, u_int32_t status) +{ + return send_status_errmsg(id, status, NULL); +} + static void send_data_or_handle(char type, u_int32_t id, const u_char *data, int dlen) { |