summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-23 21:13:40 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-23 21:13:40 +0000
commit7cea16bad574cbe60d22204df2e215ab1c8ce9e9 (patch)
treef762f990e129ffa7531cc917a420afce0ab3fc4d
parentb9051ec9a49473b81bcd50868e3367186d919fb2 (diff)
- stevesk@cvs.openbsd.org 2002/07/22 17:32:56
[monitor.c] u_int here; ok provos@
-rw-r--r--ChangeLog7
-rw-r--r--monitor.c5
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fd1396175..8a444a70c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,10 @@
19 - markus@cvs.openbsd.org 2002/07/22 11:03:06 19 - markus@cvs.openbsd.org 2002/07/22 11:03:06
20 [session.c] 20 [session.c]
21 fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors; 21 fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors;
22 22 - stevesk@cvs.openbsd.org 2002/07/22 17:32:56
23 [monitor.c]
24 u_int here; ok provos@
25
2320020722 2620020722
24 - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk 27 - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
25 - (stevesk) [xmmap.c] missing prototype for fatal() 28 - (stevesk) [xmmap.c] missing prototype for fatal()
@@ -1442,4 +1445,4 @@
1442 - (stevesk) entropy.c: typo in debug message 1445 - (stevesk) entropy.c: typo in debug message
1443 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1446 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1444 1447
1445$Id: ChangeLog,v 1.2400 2002/07/23 21:11:09 mouring Exp $ 1448$Id: ChangeLog,v 1.2401 2002/07/23 21:13:40 mouring Exp $
diff --git a/monitor.c b/monitor.c
index 148b02e51..7da929c6d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.21 2002/06/27 10:35:47 deraadt Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.22 2002/07/22 17:32:56 stevesk Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -587,7 +587,8 @@ mm_answer_authpassword(int socket, Buffer *m)
587{ 587{
588 static int call_count; 588 static int call_count;
589 char *passwd; 589 char *passwd;
590 int authenticated, plen; 590 int authenticated;
591 u_int plen;
591 592
592 passwd = buffer_get_string(m, &plen); 593 passwd = buffer_get_string(m, &plen);
593 /* Only authenticate if the context is valid */ 594 /* Only authenticate if the context is valid */