Import openssh_7.5p1.orig.tar.gz

1 files changed, 6 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index 43f484709..96d22b7e4 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.166 2016/09/28 16:33:06 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.167 2017/02/03 23:05:57 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -283,6 +283,7 @@ monitor_permit_authentications(int permit)
 void
 monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
 {
+        struct ssh *ssh = active_state; /* XXX */
         struct mon_table *ent;
         int authenticated = 0, partial = 0;
 
@@ -356,6 +357,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
 
         debug("%s: %s has been authenticated by privileged process",
             __func__, authctxt->user);
+        ssh_packet_set_log_preamble(ssh, "user %s", authctxt->user);
 
         mm_get_keystate(pmonitor);
 
@@ -695,6 +697,7 @@ mm_answer_sign(int sock, Buffer *m)
 int
 mm_answer_pwnamallow(int sock, Buffer *m)
 {
+        struct ssh *ssh = active_state; /* XXX */
         char *username;
         struct passwd *pwent;
         int allowed = 0;
@@ -739,6 +742,8 @@ mm_answer_pwnamallow(int sock, Buffer *m)
         buffer_put_cstring(m, pwent->pw_shell);
 
  out:
+        ssh_packet_set_log_preamble(ssh, "%suser %s",
+            authctxt->valid ? "authenticating" : "invalid ", authctxt->user);
         buffer_put_string(m, &options, sizeof(options));
 
 #define M_CP_STROPT(x) do { \