summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-02-09 09:52:17 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-02-09 09:52:17 +1100
commit5b53026f719bc0b2fc13a58ea0b6a0385e373bec (patch)
tree20a801465a5738391e9b67ac55f01c07e7d9ddd4
parent43d8e28763afaf066de803d63d832884c59e4160 (diff)
- dtucker@cvs.openbsd.org 2005/01/30 11:18:08
[monitor.c] Make code match intent; ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--monitor.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bc54485a0..9a7351396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 [ssh_config.5] 12 [ssh_config.5]
13 wording; 13 wording;
14 ok markus@ 14 ok markus@
15 - dtucker@cvs.openbsd.org 2005/01/30 11:18:08
16 [monitor.c]
17 Make code match intent; ok djm@
15 18
1620050208 1920050208
17 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the 20 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
@@ -2101,4 +2104,4 @@
2101 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2104 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2102 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2105 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2103 2106
2104$Id: ChangeLog,v 1.3642 2005/02/08 22:51:08 dtucker Exp $ 2107$Id: ChangeLog,v 1.3643 2005/02/08 22:52:17 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index d6df656b0..a94e2cd28 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.61 2004/07/17 05:31:41 dtucker Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.62 2005/01/30 11:18:08 dtucker Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -1322,7 +1322,7 @@ mm_answer_sesskey(int sock, Buffer *m)
1322 int rsafail; 1322 int rsafail;
1323 1323
1324 /* Turn off permissions */ 1324 /* Turn off permissions */
1325 monitor_permit(mon_dispatch, MONITOR_REQ_SESSKEY, 1); 1325 monitor_permit(mon_dispatch, MONITOR_REQ_SESSKEY, 0);
1326 1326
1327 if ((p = BN_new()) == NULL) 1327 if ((p = BN_new()) == NULL)
1328 fatal("%s: BN_new", __func__); 1328 fatal("%s: BN_new", __func__);