merge 6.3p1

1 files changed, 11 insertions, 7 deletions

diff --git a/auth2-hostbased.c b/auth2-hostbased.c
index cdf442f97..a344dcc1f 100644
--- a/auth2-hostbased.c
+++ b/auth2-hostbased.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-hostbased.c,v 1.14 2010/08/04 05:42:47 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)) &&
@@ -128,11 +132,11 @@ done:
         debug2("userauth_hostbased: authenticated %d", authenticated);
         if (key != NULL)
                 key_free(key);
-        xfree(pkalg);
-        xfree(pkblob);
-        xfree(cuser);
-        xfree(chost);
-        xfree(sig);
+        free(pkalg);
+        free(pkblob);
+        free(cuser);
+        free(chost);
+        free(sig);
         return authenticated;
 }
 
@@ -207,7 +211,7 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
                         verbose("Accepted %s public key %s from %s@%s",
                             key_type(key), fp, cuser, lookup);
                 }
-                xfree(fp);
+                free(fp);
         }
 
         return (host_status == HOST_OK);