summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-05-10 11:55:38 +1000
committerDamien Miller <djm@mindrot.org>2010-05-10 11:55:38 +1000
commit79442c07c436d0e307fa251d54606d6342b024d3 (patch)
treedce723e972eed655c6f07e0157a6abc1edc4d1ec
parentbebbb7e8a591b4a2bb297f618ca2ee1f306d3d9c (diff)
- djm@cvs.openbsd.org 2010/04/26 22:28:24
[sshconnect2.c] bz#1502: authctxt.success is declared as an int, but passed by reference to function that accepts sig_atomic_t*. Convert it to the latter; ok markus@ dtucker@
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect2.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc9e4e855..b663ddae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
19 [ssh-keygen.c] 19 [ssh-keygen.c]
20 refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS, 20 refuse to generate keys longer than OPENSSL_[RD]SA_MAX_MODULUS_BITS,
21 since we would refuse to use them anyway. bz#1516; ok dtucker@ 21 since we would refuse to use them anyway. bz#1516; ok dtucker@
22 - djm@cvs.openbsd.org 2010/04/26 22:28:24
23 [sshconnect2.c]
24 bz#1502: authctxt.success is declared as an int, but passed by
25 reference to function that accepts sig_atomic_t*. Convert it to
26 the latter; ok markus@ dtucker@
22 27
2320100423 2820100423
24 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir 29 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
diff --git a/sshconnect2.c b/sshconnect2.c
index e146a4b26..4c379ae59 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect2.c,v 1.182 2010/04/16 01:47:26 djm Exp $ */ 1/* $OpenBSD: sshconnect2.c,v 1.183 2010/04/26 22:28:24 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Damien Miller. All rights reserved. 4 * Copyright (c) 2008 Damien Miller. All rights reserved.
@@ -195,7 +195,7 @@ struct Authctxt {
195 const char *host; 195 const char *host;
196 const char *service; 196 const char *service;
197 Authmethod *method; 197 Authmethod *method;
198 int success; 198 sig_atomic_t success;
199 char *authlist; 199 char *authlist;
200 /* pubkey */ 200 /* pubkey */
201 Idlist keys; 201 Idlist keys;