tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 08:44:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2002/06/22 23:09:51

Browse Source 
[monitor.c]
     save auth method before monitor_reset_key_state(); bugzilla bug #284;
     ok provos@
This commit is contained in:
Ben Lindstrom 2002-06-23 00:38:24 +00:00
parent 57f08005d3
commit e1c0912cb6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -28,6 +28,10 @@
[sshd.c] [sshd.c]
don't call setsid() if debugging or run from inetd; no "Operation not don't call setsid() if debugging or run from inetd; no "Operation not
permitted" errors now; ok millert@ markus@ permitted" errors now; ok millert@ markus@
- stevesk@cvs.openbsd.org 2002/06/22 23:09:51
[monitor.c]
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
20020622 20020622
- (djm) Update README.privsep; spotted by fries@ - (djm) Update README.privsep; spotted by fries@
@ -1037,4 +1041,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2252 2002/06/23 00:37:10 mouring Exp $ $Id: ChangeLog,v 1.2253 2002/06/23 00:38:24 mouring Exp $

6
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.16 2002/06/21 05:50:51 djm Exp $"); RCSID("$OpenBSD: monitor.c,v 1.17 2002/06/22 23:09:51 stevesk Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -982,14 +982,14 @@ mm_answer_keyverify(int socket, Buffer *m)
xfree(signature); xfree(signature);
xfree(data); xfree(data);
auth_method = key_blobtype == MM_USERKEY ? "publickey" : "hostbased";
monitor_reset_key_state(); monitor_reset_key_state();
buffer_clear(m); buffer_clear(m);
buffer_put_int(m, verified); buffer_put_int(m, verified);
mm_request_send(socket, MONITOR_ANS_KEYVERIFY, m); mm_request_send(socket, MONITOR_ANS_KEYVERIFY, m);
auth_method = key_blobtype == MM_USERKEY ? "publickey" : "hostbased";
return (verified); return (verified);
} }