===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- src/usr.bin/ssh/sshconnect.c	2020/10/04 09:45:01	1.335
+++ src/usr.bin/ssh/sshconnect.c	2020/10/07 02:20:35	1.336
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.335 2020/10/04 09:45:01 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.336 2020/10/07 02:20:35 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -587,7 +587,12 @@
 		    "(null)" : key->cert->signature_type, ssh_err(r));
 		return 0;
 	}
-
+	/* Do not attempt hostkey update if a certificate was successful */
+	if (options.update_hostkeys != 0) {
+		options.update_hostkeys = 0;
+		debug3("%s: certificate host key in use; disabling "
+		    "UpdateHostkeys", __func__);
+	}
 	return 1;
 }