summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:53:26 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:53:26 +0000
commit0076d75c253af56d178c584bd110425d884d9b9c (patch)
tree2818dc88bd9ca634c1cd2f84902005be0c922a81
parente2b9b064257a64550fba5a03f307bb5138b67717 (diff)
- markus@cvs.openbsd.org 2001/07/22 22:04:19
[readconf.c ssh.1] enable challenge-response auth by default; ok millert@
-rw-r--r--ChangeLog5
-rw-r--r--readconf.c4
-rw-r--r--ssh.17
3 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d6c029f8..cc0d9cd3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 [ssh.1] 7 [ssh.1]
8 There is no option "Compress", point to "Compression" instead; ok 8 There is no option "Compress", point to "Compression" instead; ok
9 markus 9 markus
10 - markus@cvs.openbsd.org 2001/07/22 22:04:19
11 [readconf.c ssh.1]
12 enable challenge-response auth by default; ok millert@
10 13
1120010803 1420010803
12 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 15 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6117,4 +6120,4 @@
6117 - Wrote replacements for strlcpy and mkdtemp 6120 - Wrote replacements for strlcpy and mkdtemp
6118 - Released 1.0pre1 6121 - Released 1.0pre1
6119 6122
6120$Id: ChangeLog,v 1.1427 2001/08/06 20:50:55 mouring Exp $ 6123$Id: ChangeLog,v 1.1428 2001/08/06 20:53:26 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 19b571a71..36700fbd5 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.82 2001/06/26 16:15:23 dugsong Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.83 2001/07/22 22:04:19 markus Exp $");
16 16
17#include "ssh.h" 17#include "ssh.h"
18#include "xmalloc.h" 18#include "xmalloc.h"
@@ -803,7 +803,7 @@ fill_default_options(Options * options)
803 if (options->pubkey_authentication == -1) 803 if (options->pubkey_authentication == -1)
804 options->pubkey_authentication = 1; 804 options->pubkey_authentication = 1;
805 if (options->challenge_response_authentication == -1) 805 if (options->challenge_response_authentication == -1)
806 options->challenge_response_authentication = 0; 806 options->challenge_response_authentication = 1;
807#if defined(KRB4) || defined(KRB5) 807#if defined(KRB4) || defined(KRB5)
808 if (options->kerberos_authentication == -1) 808 if (options->kerberos_authentication == -1)
809 options->kerberos_authentication = 1; 809 options->kerberos_authentication = 1;
diff --git a/ssh.1 b/ssh.1
index a4f040a47..f8d9fc689 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.121 2001/07/22 21:32:42 pvalchev Exp $ 37.\" $OpenBSD: ssh.1,v 1.122 2001/07/22 22:04:19 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -1012,15 +1012,12 @@ The default is
1012Note that this option applies to protocol version 1 only. 1012Note that this option applies to protocol version 1 only.
1013.It Cm ChallengeResponseAuthentication 1013.It Cm ChallengeResponseAuthentication
1014Specifies whether to use challenge response authentication. 1014Specifies whether to use challenge response authentication.
1015Currently there is only support for
1016.Xr skey 1
1017authentication.
1018The argument to this keyword must be 1015The argument to this keyword must be
1019.Dq yes 1016.Dq yes
1020or 1017or
1021.Dq no . 1018.Dq no .
1022The default is 1019The default is
1023.Dq no . 1020.Dq yes .
1024.It Cm StrictHostKeyChecking 1021.It Cm StrictHostKeyChecking
1025If this flag is set to 1022If this flag is set to
1026.Dq yes , 1023.Dq yes ,