diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2-chall.c | 10 |
2 files changed, 7 insertions, 8 deletions
@@ -5,6 +5,9 @@ | |||
5 | channel_print_adm_permitted_opens() should deal with all the printing | 5 | channel_print_adm_permitted_opens() should deal with all the printing |
6 | for that config option. suggested by markus@; ok markus@ djm@ | 6 | for that config option. suggested by markus@; ok markus@ djm@ |
7 | dtucker@ | 7 | dtucker@ |
8 | - djm@cvs.openbsd.org 2008/12/09 04:32:22 | ||
9 | [auth2-chall.c] | ||
10 | replace by-hand string building with xasprinf(); ok deraadt@ | ||
8 | 11 | ||
9 | 20090107 | 12 | 20090107 |
10 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 13 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
@@ -5014,5 +5017,5 @@ | |||
5014 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5017 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5015 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5018 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5016 | 5019 | ||
5017 | $Id: ChangeLog,v 1.5161 2009/01/28 05:13:04 djm Exp $ | 5020 | $Id: ChangeLog,v 1.5162 2009/01/28 05:13:39 djm Exp $ |
5018 | 5021 | ||
diff --git a/auth2-chall.c b/auth2-chall.c index d816578c6..e6dbffe22 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-chall.c,v 1.33 2007/09/21 08:15:29 djm Exp $ */ | 1 | /* $OpenBSD: auth2-chall.c,v 1.34 2008/12/09 04:32:22 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2001 Per Allansson. All rights reserved. | 4 | * Copyright (c) 2001 Per Allansson. All rights reserved. |
@@ -281,7 +281,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) | |||
281 | { | 281 | { |
282 | Authctxt *authctxt = ctxt; | 282 | Authctxt *authctxt = ctxt; |
283 | KbdintAuthctxt *kbdintctxt; | 283 | KbdintAuthctxt *kbdintctxt; |
284 | int authenticated = 0, res, len; | 284 | int authenticated = 0, res; |
285 | u_int i, nresp; | 285 | u_int i, nresp; |
286 | char **response = NULL, *method; | 286 | char **response = NULL, *method; |
287 | 287 | ||
@@ -330,11 +330,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) | |||
330 | break; | 330 | break; |
331 | } | 331 | } |
332 | 332 | ||
333 | len = strlen("keyboard-interactive") + 2 + | 333 | xasprintf(&method, "keyboard-interactive/%s", kbdintctxt->device->name); |
334 | strlen(kbdintctxt->device->name); | ||
335 | method = xmalloc(len); | ||
336 | snprintf(method, len, "keyboard-interactive/%s", | ||
337 | kbdintctxt->device->name); | ||
338 | 334 | ||
339 | if (!authctxt->postponed) { | 335 | if (!authctxt->postponed) { |
340 | if (authenticated) { | 336 | if (authenticated) { |