tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: add a variant of send_status() that allows overriding the 

default, generic error message. feedback/ok markus & jsg

OpenBSD-Commit-ID: 81f251e975d759994131b717ee7c0b439659c40f
This commit is contained in:
djm@openbsd.org 2022-01-08 07:33:54 +00:00 committed by Damien Miller
parent 9614113377
commit 9acddcd591
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sftp-server.c
View File

@ -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. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -536,7 +536,7 @@ status_to_message(u_int32_t status)
} }
static void 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; struct sshbuf *msg;
int r; int r;
@ -552,14 +552,21 @@ send_status(u_int32_t id, u_int32_t status)
(r = sshbuf_put_u32(msg, status)) != 0) (r = sshbuf_put_u32(msg, status)) != 0)
fatal_fr(r, "compose"); fatal_fr(r, "compose");
if (version >= 3) { if (version >= 3) {
if ((r = sshbuf_put_cstring(msg, if ((r = sshbuf_put_cstring(msg, errmsg == NULL ?
status_to_message(status))) != 0 || status_to_message(status) : errmsg)) != 0 ||
(r = sshbuf_put_cstring(msg, "")) != 0) (r = sshbuf_put_cstring(msg, "")) != 0)
fatal_fr(r, "compose message"); fatal_fr(r, "compose message");
} }
send_msg(msg); send_msg(msg);
sshbuf_free(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 static void
send_data_or_handle(char type, u_int32_t id, const u_char *data, int dlen) send_data_or_handle(char type, u_int32_t id, const u_char *data, int dlen)
{ {