From 2808d18ca47ad3d251836c555f0e22aaca03d15c Mon Sep 17 00:00:00 2001 From: "markus@openbsd.org" Date: Mon, 9 Jul 2018 21:26:02 +0000 Subject: upstream: sshd: switch loginmsg to sshbuf API; ok djm@ OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42 --- monitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'monitor.c') diff --git a/monitor.c b/monitor.c index c68e1b0d9..44af5f489 100644 --- a/monitor.c +++ b/monitor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor.c,v 1.180 2018/03/03 03:15:51 djm Exp $ */ +/* $OpenBSD: monitor.c,v 1.181 2018/07/09 21:26:02 markus Exp $ */ /* * Copyright 2002 Niels Provos * Copyright 2002 Markus Friedl @@ -115,7 +115,7 @@ extern u_int utmp_len; extern u_char session_id[]; extern Buffer auth_debug; extern int auth_debug_init; -extern Buffer loginmsg; +extern struct sshbuf *loginmsg; extern struct sshauthopt *auth_opts; /* XXX move to permanent ssh->authctxt? */ /* State exported from the child */ @@ -1495,8 +1495,8 @@ mm_answer_pty(int sock, Buffer *m) close(0); /* send messages generated by record_login */ - buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg)); - buffer_clear(&loginmsg); + buffer_put_string(m, buffer_ptr(loginmsg), buffer_len(loginmsg)); + buffer_clear(loginmsg); mm_request_send(sock, MONITOR_ANS_PTY, m); -- cgit v1.2.3