* New upstream release (http://www.openssh.com/txt/release-6.2).

  - Add support for multiple required authentication in SSH protocol 2 via
    an AuthenticationMethods option (closes: #195716).
  - Fix Sophie Germain formula in moduli(5) (closes: #698612).
  - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
    #99785, #322228, #620428; LP: #518883, #835901, #1074798).

1 files changed, 6 insertions, 7 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index e6dbffe22..6505d4009 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.34 2008/12/09 04:32:22 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.36 2012/12/03 00:14:06 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -283,7 +283,8 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
         KbdintAuthctxt *kbdintctxt;
         int authenticated = 0, res;
         u_int i, nresp;
-        char **response = NULL, *method;
+        const char *devicename = NULL;
+        char **response = NULL;
 
         if (authctxt == NULL)
                 fatal("input_userauth_info_response: no authctxt");
@@ -329,9 +330,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
                 /* Failure! */
                 break;
         }
-
-        xasprintf(&method, "keyboard-interactive/%s", kbdintctxt->device->name);
-
+        devicename = kbdintctxt->device->name;
         if (!authctxt->postponed) {
                 if (authenticated) {
                         auth2_challenge_stop(authctxt);
@@ -341,8 +340,8 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
                         auth2_challenge_start(authctxt);
                 }
         }
-        userauth_finish(authctxt, authenticated, method);
-        xfree(method);
+        userauth_finish(authctxt, authenticated, "keyboard-interactive",
+            devicename);
 }
 
 void