[openssh-commits] [openssh] 02/02: upstream: revert enabling UpdateHostKeys by default - there are still

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 501f3582438cb2cb1cb92be0f17be490ae96fb23
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Mon Feb 3 23:47:57 2020 +0000

    upstream: revert enabling UpdateHostKeys by default - there are still
    
    corner cases we need to address; ok markus
    
    OpenBSD-Commit-ID: ff7ad941bfdc49fb1d8baa95fd0717a61adcad57
---
 readconf.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/readconf.c b/readconf.c
index a6a16018..20f1c04e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.324 2020/01/30 22:19:32 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.325 2020/02/03 23:47:57 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -2110,19 +2110,8 @@ fill_default_options(Options * options)
 		options->system_hostfiles[options->num_system_hostfiles++] =
 		    xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2);
 	}
-	if (options->update_hostkeys == -1) {
-		/*
-		 * Enable UpdateHostKeys non-interactively if the user has
-		 * not overridden the default known_hosts selection, or has
-		 * overridden it with the default. Otherwise, prompt.
-		 */
-		if (options->num_user_hostfiles == 0 ||
-		    (options->num_user_hostfiles == 1 && strcmp(options->
-		    user_hostfiles[0], _PATH_SSH_USER_HOSTFILE) == 0))
-			options->update_hostkeys = SSH_UPDATE_HOSTKEYS_YES;
-		else
-			options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;
-	}
+	if (options->update_hostkeys == -1)
+			options->update_hostkeys = SSH_UPDATE_HOSTKEYS_NO;
 	if (options->num_user_hostfiles == 0) {
 		options->user_hostfiles[options->num_user_hostfiles++] =
 		    xstrdup(_PATH_SSH_USER_HOSTFILE);

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.