summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-04-22 01:24:02 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-04-22 01:24:02 +0000
commit1f687b07f5fc46d1cc047c61ebbf6b0c7c92f668 (patch)
tree3e5ae730af2ae26fa7ac88ec67e2cc0bb84bb675 /usr.bin
parentdcb242201fc0cc97d7bdf074f40c4804daafeb4e (diff)
unknown certificate extensions are non-fatal, so don't fatal
when they are encountered; bz#2387 reported by Bob Van Zant; ok dtucker@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/auth-options.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth-options.c b/usr.bin/ssh/auth-options.c
index b25a227e6af..3d7c334720c 100644
--- a/usr.bin/ssh/auth-options.c
+++ b/usr.bin/ssh/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
@@ -600,7 +600,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,