diff options
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | ssh_config.5 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/readconf.c b/readconf.c index dd78da530..a5bb4a25e 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.230 2015/01/30 11:43:14 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.231 2015/02/02 07:41:40 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1855,7 +1855,7 @@ fill_default_options(Options * options) | |||
1855 | if (options->fingerprint_hash == -1) | 1855 | if (options->fingerprint_hash == -1) |
1856 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; | 1856 | options->fingerprint_hash = SSH_FP_HASH_DEFAULT; |
1857 | if (options->update_hostkeys == -1) | 1857 | if (options->update_hostkeys == -1) |
1858 | options->update_hostkeys = 1; | 1858 | options->update_hostkeys = 0; |
1859 | if (options->hostbased_key_types == NULL) | 1859 | if (options->hostbased_key_types == NULL) |
1860 | options->hostbased_key_types = xstrdup("*"); | 1860 | options->hostbased_key_types = xstrdup("*"); |
1861 | 1861 | ||
diff --git a/ssh_config.5 b/ssh_config.5 index 95b7bf6e4..ce79fe03f 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.202 2015/01/30 11:43:14 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.203 2015/02/02 07:41:40 djm Exp $ |
37 | .Dd $Mdocdate: January 30 2015 $ | 37 | .Dd $Mdocdate: February 2 2015 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1511,9 +1511,9 @@ after authentication has completed and add them to | |||
1511 | .Cm UserKnownHostsFile . | 1511 | .Cm UserKnownHostsFile . |
1512 | The argument must be | 1512 | The argument must be |
1513 | .Dq yes | 1513 | .Dq yes |
1514 | (the default) | ||
1515 | or | 1514 | or |
1516 | .Dq no . | 1515 | .Dq no |
1516 | (the default). | ||
1517 | Enabling this option allows learning alternate hostkeys for a server | 1517 | Enabling this option allows learning alternate hostkeys for a server |
1518 | and supports graceful key rotation by allowing a server to send replacement | 1518 | and supports graceful key rotation by allowing a server to send replacement |
1519 | public keys before old ones are removed. | 1519 | public keys before old ones are removed. |