summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-07-09 21:26:02 +0000
committerDamien Miller <djm@mindrot.org>2018-07-10 15:21:58 +1000
commit2808d18ca47ad3d251836c555f0e22aaca03d15c (patch)
tree06bc9605dd843d77ee25187637e348369e59cb1d /monitor.c
parent89dd615b8b531979be63f05f9d5624367c9b28e6 (diff)
upstream: sshd: switch loginmsg to sshbuf API; ok djm@
OpenBSD-Commit-ID: f3cb4e54bff15c593602d95cc43e32ee1a4bac42
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index c68e1b0d9..44af5f489 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.180 2018/03/03 03:15:51 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.181 2018/07/09 21:26:02 markus Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -115,7 +115,7 @@ extern u_int utmp_len;
115extern u_char session_id[]; 115extern u_char session_id[];
116extern Buffer auth_debug; 116extern Buffer auth_debug;
117extern int auth_debug_init; 117extern int auth_debug_init;
118extern Buffer loginmsg; 118extern struct sshbuf *loginmsg;
119extern struct sshauthopt *auth_opts; /* XXX move to permanent ssh->authctxt? */ 119extern struct sshauthopt *auth_opts; /* XXX move to permanent ssh->authctxt? */
120 120
121/* State exported from the child */ 121/* State exported from the child */
@@ -1495,8 +1495,8 @@ mm_answer_pty(int sock, Buffer *m)
1495 close(0); 1495 close(0);
1496 1496
1497 /* send messages generated by record_login */ 1497 /* send messages generated by record_login */
1498 buffer_put_string(m, buffer_ptr(&loginmsg), buffer_len(&loginmsg)); 1498 buffer_put_string(m, buffer_ptr(loginmsg), buffer_len(loginmsg));
1499 buffer_clear(&loginmsg); 1499 buffer_clear(loginmsg);
1500 1500
1501 mm_request_send(sock, MONITOR_ANS_PTY, m); 1501 mm_request_send(sock, MONITOR_ANS_PTY, m);
1502 1502