diff options
Diffstat (limited to 'auth-options.c')
-rw-r--r-- | auth-options.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/auth-options.c b/auth-options.c index df6133037..d4d22d7a5 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.62 2013/12/19 00:27:57 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.64 2014/07/15 15:54:14 millert 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 |
@@ -26,9 +26,9 @@ | |||
26 | #include "log.h" | 26 | #include "log.h" |
27 | #include "canohost.h" | 27 | #include "canohost.h" |
28 | #include "buffer.h" | 28 | #include "buffer.h" |
29 | #include "misc.h" | ||
29 | #include "channels.h" | 30 | #include "channels.h" |
30 | #include "servconf.h" | 31 | #include "servconf.h" |
31 | #include "misc.h" | ||
32 | #include "key.h" | 32 | #include "key.h" |
33 | #include "auth-options.h" | 33 | #include "auth-options.h" |
34 | #include "hostfile.h" | 34 | #include "hostfile.h" |
@@ -339,6 +339,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | |||
339 | patterns[i] = '\0'; | 339 | patterns[i] = '\0'; |
340 | opts++; | 340 | opts++; |
341 | p = patterns; | 341 | p = patterns; |
342 | /* XXX - add streamlocal support */ | ||
342 | host = hpdelim(&p); | 343 | host = hpdelim(&p); |
343 | if (host == NULL || strlen(host) >= NI_MAXHOST) { | 344 | if (host == NULL || strlen(host) >= NI_MAXHOST) { |
344 | debug("%.100s, line %lu: Bad permitopen " | 345 | debug("%.100s, line %lu: Bad permitopen " |
@@ -603,8 +604,8 @@ auth_cert_options(Key *k, struct passwd *pw) | |||
603 | 604 | ||
604 | if (key_cert_is_legacy(k)) { | 605 | if (key_cert_is_legacy(k)) { |
605 | /* All options are in the one field for v00 certs */ | 606 | /* All options are in the one field for v00 certs */ |
606 | if (parse_option_list(buffer_ptr(&k->cert->critical), | 607 | if (parse_option_list(buffer_ptr(k->cert->critical), |
607 | buffer_len(&k->cert->critical), pw, | 608 | buffer_len(k->cert->critical), pw, |
608 | OPTIONS_CRITICAL|OPTIONS_EXTENSIONS, 1, | 609 | OPTIONS_CRITICAL|OPTIONS_EXTENSIONS, 1, |
609 | &cert_no_port_forwarding_flag, | 610 | &cert_no_port_forwarding_flag, |
610 | &cert_no_agent_forwarding_flag, | 611 | &cert_no_agent_forwarding_flag, |
@@ -616,14 +617,14 @@ auth_cert_options(Key *k, struct passwd *pw) | |||
616 | return -1; | 617 | return -1; |
617 | } else { | 618 | } else { |
618 | /* Separate options and extensions for v01 certs */ | 619 | /* Separate options and extensions for v01 certs */ |
619 | if (parse_option_list(buffer_ptr(&k->cert->critical), | 620 | if (parse_option_list(buffer_ptr(k->cert->critical), |
620 | buffer_len(&k->cert->critical), pw, | 621 | buffer_len(k->cert->critical), pw, |
621 | OPTIONS_CRITICAL, 1, NULL, NULL, NULL, NULL, NULL, | 622 | OPTIONS_CRITICAL, 1, NULL, NULL, NULL, NULL, NULL, |
622 | &cert_forced_command, | 623 | &cert_forced_command, |
623 | &cert_source_address_done) == -1) | 624 | &cert_source_address_done) == -1) |
624 | return -1; | 625 | return -1; |
625 | if (parse_option_list(buffer_ptr(&k->cert->extensions), | 626 | if (parse_option_list(buffer_ptr(k->cert->extensions), |
626 | buffer_len(&k->cert->extensions), pw, | 627 | buffer_len(k->cert->extensions), pw, |
627 | OPTIONS_EXTENSIONS, 1, | 628 | OPTIONS_EXTENSIONS, 1, |
628 | &cert_no_port_forwarding_flag, | 629 | &cert_no_port_forwarding_flag, |
629 | &cert_no_agent_forwarding_flag, | 630 | &cert_no_agent_forwarding_flag, |