diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2009-10-11 21:51:08 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-11 21:51:08 +1100 |
| commit | bad5076bb5d5587cf8b889cd9ce495c39282786b (patch) | |
| tree | 1772b13cc37393c1ebbc32cf10ad293f8937ddb3 /servconf.c | |
| parent | c182d993762f86fbdf9e54dd5b0e3e3d229ebc13 (diff) | |
- (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2009/10/08 14:03:41
[sshd_config readconf.c ssh_config.5 servconf.c sshd_config.5]
disable protocol 1 by default (after a transition period of about 10 years)
ok deraadt
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index b51b86a8f..c2e5cc6f4 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: servconf.c,v 1.195 2009/04/14 21:10:54 jj Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.196 2009/10/08 14:03:41 markus Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 4 | * All rights reserved | 4 | * All rights reserved |
| @@ -139,7 +139,7 @@ fill_default_server_options(ServerOptions *options) | |||
| 139 | 139 | ||
| 140 | /* Standard Options */ | 140 | /* Standard Options */ |
| 141 | if (options->protocol == SSH_PROTO_UNKNOWN) | 141 | if (options->protocol == SSH_PROTO_UNKNOWN) |
| 142 | options->protocol = SSH_PROTO_1|SSH_PROTO_2; | 142 | options->protocol = SSH_PROTO_2; |
| 143 | if (options->num_host_key_files == 0) { | 143 | if (options->num_host_key_files == 0) { |
| 144 | /* fill default hostkeys for protocols */ | 144 | /* fill default hostkeys for protocols */ |
| 145 | if (options->protocol & SSH_PROTO_1) | 145 | if (options->protocol & SSH_PROTO_1) |