summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index 380e1e667..35972fe39 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.516 2020/01/27 20:51:32 markus Exp $ */ 1/* $OpenBSD: ssh.c,v 1.517 2020/01/28 07:24:15 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
@@ -1259,6 +1259,9 @@ main(int ac, char **av)
1259 debug("UpdateHostKeys=ask is incompatible with " 1259 debug("UpdateHostKeys=ask is incompatible with "
1260 "remote command execution; disabling"); 1260 "remote command execution; disabling");
1261 options.update_hostkeys = 0; 1261 options.update_hostkeys = 0;
1262 } else if (options.log_level < SYSLOG_LEVEL_INFO) {
1263 /* no point logging anything; user won't see it */
1264 options.update_hostkeys = 0;
1262 } 1265 }
1263 } 1266 }
1264 if (options.connection_attempts <= 0) 1267 if (options.connection_attempts <= 0)