From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 22 Apr 2015 01:24:01 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_6_9_P1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca42c1758575e592239de1d5755140e054b91a0d;p=thirdparty%2Fopenssh-portable.git

upstream commit

unknown certificate extensions are non-fatal, so don't
 fatal when they are encountered; bz#2387 reported by Bob Van Zant; ok
 dtucker@
---

diff --git a/auth-options.c b/auth-options.c
index 4f0da9c04..0595537be 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.65 2015/01/14 10:30:34 markus Exp $ */
+/* $OpenBSD: auth-options.c,v 1.66 2015/04/22 01:24:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -603,7 +603,7 @@ auth_cert_options(struct sshkey *k, struct passwd *pw)
 		    &cert_source_address_done) == -1)
 			return -1;
 		if (parse_option_list(k->cert->extensions, pw,
-		    OPTIONS_EXTENSIONS, 1,
+		    OPTIONS_EXTENSIONS, 0,
 		    &cert_no_port_forwarding_flag,
 		    &cert_no_agent_forwarding_flag,
 		    &cert_no_x11_forwarding_flag,