6 files changed, 40 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index e0781041e..f8e2c6858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
    - markus@cvs.openbsd.org 2013/06/20 19:15:06
      [krl.c]
      don't leak the rdata blob on errors; ok djm@
+   - djm@cvs.openbsd.org 2013/06/21 00:34:49
+     [auth-rsa.c auth.h auth2-hostbased.c auth2-pubkey.c monitor.c]
+     for hostbased authentication, print the client host and user on
+     the auth success/failure line; bz#2064, ok dtucker@
 
 20130702
  - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
diff --git a/auth-rsa.c b/auth-rsa.c
index 92f0ad75c..b7a03fdc4 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.83 2013/05/19 02:42:42 djm Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.84 2013/06/21 00:34:49 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -332,7 +332,7 @@ auth_rsa(Authctxt *authctxt, BIGNUM *client_n)
          * options; this will be reset if the options cause the
          * authentication to be rejected.
          */
-        pubkey_auth_info(authctxt, key);
+        pubkey_auth_info(authctxt, key, NULL);
 
         packet_send_debug("RSA authentication accepted.");
         return (1);
diff --git a/auth.h b/auth.h
index a406e1393..caf44adc0 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.74 2013/05/19 02:42:42 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.75 2013/06/21 00:34:49 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -122,7 +122,8 @@ int	 auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
 int      auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *);
 int      hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
 int      user_key_allowed(struct passwd *, Key *);
-void     pubkey_auth_info(Authctxt *, const Key *);
+void     pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
+            __attribute__((__format__ (printf, 3, 4)));
 
 struct stat;
 int      auth_secure_path(const char *, struct stat *, const char *, uid_t,
diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index e6d05e261..a344dcc1f 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.15 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth2-hostbased.c,v 1.16 2013/06/21 00:34:49 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -116,6 +116,10 @@ userauth_hostbased(Authctxt *authctxt)
 #ifdef DEBUG_PK
         buffer_dump(&b);
 #endif
+
+        pubkey_auth_info(authctxt, key,
+            "client user \"%.100s\", client host \"%.100s\"", cuser, chost);
+
         /* test for allowed key and correct signature */
         authenticated = 0;
         if (PRIVSEP(hostbased_key_allowed(authctxt->pw, cuser, chost, key)) &&
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 45306f839..2b3ecb104 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.37 2013/05/19 02:38:28 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.38 2013/06/21 00:34:49 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -147,7 +147,7 @@ userauth_pubkey(Authctxt *authctxt)
 #ifdef DEBUG_PK
                 buffer_dump(&b);
 #endif
-                pubkey_auth_info(authctxt, key);
+                pubkey_auth_info(authctxt, key, NULL);
 
                 /* test for correct signature */
                 authenticated = 0;
@@ -190,23 +190,37 @@ done:
 }
 
 void
-pubkey_auth_info(Authctxt *authctxt, const Key *key)
+pubkey_auth_info(Authctxt *authctxt, const Key *key, const char *fmt, ...)
 {
-        char *fp;
+        char *fp, *extra;
+        va_list ap;
+        int i;
+
+        extra = NULL;
+        if (fmt != NULL) {
+                va_start(ap, fmt);
+                i = vasprintf(&extra, fmt, ap);
+                va_end(ap);
+                if (i < 0 || extra == NULL)
+                        fatal("%s: vasprintf failed", __func__);        
+        }
 
         if (key_is_cert(key)) {
                 fp = key_fingerprint(key->cert->signature_key,
                     SSH_FP_MD5, SSH_FP_HEX);
-                auth_info(authctxt, "%s ID %s (serial %llu) CA %s %s", 
+                auth_info(authctxt, "%s ID %s (serial %llu) CA %s %s%s%s", 
                     key_type(key), key->cert->key_id,
                     (unsigned long long)key->cert->serial,
-                    key_type(key->cert->signature_key), fp);
+                    key_type(key->cert->signature_key), fp,
+                    extra == NULL ? "" : ", ", extra == NULL ? "" : extra);
                 free(fp);
         } else {
                 fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
-                auth_info(authctxt, "%s %s", key_type(key), fp);
+                auth_info(authctxt, "%s %s%s%s", key_type(key), fp,
+                    extra == NULL ? "" : ", ", extra == NULL ? "" : extra);
                 free(fp);
         }
+        free(extra);
 }
 
 static int
diff --git a/monitor.c b/monitor.c
index 7286126f5..0516f60a2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.125 2013/05/19 02:42:42 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.126 2013/06/21 00:34:49 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1165,7 +1165,7 @@ mm_answer_keyallowed(int sock, Buffer *m)
                 case MM_USERKEY:
                         allowed = options.pubkey_authentication &&
                             user_key_allowed(authctxt->pw, key);
-                        pubkey_auth_info(authctxt, key);
+                        pubkey_auth_info(authctxt, key, NULL);
                         auth_method = "publickey";
                         if (options.pubkey_authentication && allowed != 1)
                                 auth_clear_options();
@@ -1174,6 +1174,9 @@ mm_answer_keyallowed(int sock, Buffer *m)
                         allowed = options.hostbased_authentication &&
                             hostbased_key_allowed(authctxt->pw,
                             cuser, chost, key);
+                        pubkey_auth_info(authctxt, key,
+                            "client user \"%.100s\", client host \"%.100s\"",
+                            cuser, chost);
                         auth_method = "hostbased";
                         break;
                 case MM_RSAHOSTKEY: