diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-04-22 01:24:01 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-29 18:14:22 +1000 |
commit | ca42c1758575e592239de1d5755140e054b91a0d (patch) | |
tree | b57ba681bff66c2d68dbca52b8908d98824b2f42 /auth-options.c | |
parent | 39bfbf7caad231cc4bda6909fb1af0705bca04d8 (diff) |
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@
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.65 2015/01/14 10:30:34 markus Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.66 2015/04/22 01:24:01 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 |
@@ -603,7 +603,7 @@ auth_cert_options(struct sshkey *k, struct passwd *pw) | |||
603 | &cert_source_address_done) == -1) | 603 | &cert_source_address_done) == -1) |
604 | return -1; | 604 | return -1; |
605 | if (parse_option_list(k->cert->extensions, pw, | 605 | if (parse_option_list(k->cert->extensions, pw, |
606 | OPTIONS_EXTENSIONS, 1, | 606 | OPTIONS_EXTENSIONS, 0, |
607 | &cert_no_port_forwarding_flag, | 607 | &cert_no_port_forwarding_flag, |
608 | &cert_no_agent_forwarding_flag, | 608 | &cert_no_agent_forwarding_flag, |
609 | &cert_no_x11_forwarding_flag, | 609 | &cert_no_x11_forwarding_flag, |