summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth2-chall.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fca0f7fc..0a3ebd8b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,9 @@
143 - markus@cvs.openbsd.org 2002/01/11 23:02:18 143 - markus@cvs.openbsd.org 2002/01/11 23:02:18
144 [readpass.c] 144 [readpass.c]
145 use _PATH_TTY 145 use _PATH_TTY
146 - markus@cvs.openbsd.org 2002/01/11 23:02:51
147 [auth2-chall.c]
148 use snprintf; mouring@
146 149
147 150
14820020121 15120020121
@@ -7291,4 +7294,4 @@
7291 - Wrote replacements for strlcpy and mkdtemp 7294 - Wrote replacements for strlcpy and mkdtemp
7292 - Released 1.0pre1 7295 - Released 1.0pre1
7293 7296
7294$Id: ChangeLog,v 1.1763 2002/01/22 12:24:51 djm Exp $ 7297$Id: ChangeLog,v 1.1764 2002/01/22 12:25:08 djm Exp $
diff --git a/auth2-chall.c b/auth2-chall.c
index 92d0020e0..a1f96392e 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -23,7 +23,7 @@
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-chall.c,v 1.14 2002/01/11 20:14:11 markus Exp $"); 26RCSID("$OpenBSD: auth2-chall.c,v 1.15 2002/01/11 23:02:51 markus Exp $");
27 27
28#include "ssh2.h" 28#include "ssh2.h"
29#include "auth.h" 29#include "auth.h"
@@ -291,9 +291,8 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
291 len = strlen("keyboard-interactive") + 2 + 291 len = strlen("keyboard-interactive") + 2 +
292 strlen(kbdintctxt->device->name); 292 strlen(kbdintctxt->device->name);
293 method = xmalloc(len); 293 method = xmalloc(len);
294 strlcpy(method, "keyboard-interactive", len); 294 snprintf(method, len, "keyboard-interactive/%s",
295 strlcat(method, "/", len); 295 kbdintctxt->device->name);
296 strlcat(method, kbdintctxt->device->name, len);
297 296
298 if (!authctxt->postponed) { 297 if (!authctxt->postponed) {
299 if (authenticated) { 298 if (authenticated) {