- djm@cvs.openbsd.org 2012/12/02 20:34:10

     [auth.c auth.h auth1.c auth2-chall.c auth2-gss.c auth2-jpake.c auth2.c]
     [monitor.c monitor.h]
     Fixes logging of partial authentication when privsep is enabled
     Previously, we recorded "Failed xxx" since we reset authenticated before
     calling auth_log() in auth2.c. This adds an explcit "Partial" state.

     Add a "submethod" to auth_log() to report which submethod is used
     for keyboard-interactive.

     Fix multiple authentication when one of the methods is
     keyboard-interactive.

     ok markus@

1 files changed, 5 insertions, 7 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index e6dbffe22..8fdb33498 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.35 2012/12/02 20:34:09 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -283,7 +283,7 @@ 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;
+        char *devicename = NULL, **response = NULL;
 
         if (authctxt == NULL)
                 fatal("input_userauth_info_response: no authctxt");
@@ -329,9 +329,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 +339,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