diff options
-rw-r--r-- | auth-options.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auth-options.c b/auth-options.c index c55c3ed06..fe6432f57 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.80 2018/06/06 18:23:32 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.81 2018/06/07 04:31:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Damien Miller <djm@mindrot.org> | 3 | * Copyright (c) 2018 Damien Miller <djm@mindrot.org> |
4 | * | 4 | * |
@@ -313,7 +313,7 @@ sshauthopt_new_with_keys_defaults(void) | |||
313 | * Return 0 on success. Return -1 on failure and sets *errstrp to error reason. | 313 | * Return 0 on success. Return -1 on failure and sets *errstrp to error reason. |
314 | */ | 314 | */ |
315 | static int | 315 | static int |
316 | handle_permit(const char *opts, char ***permitsp, size_t *npermitsp, | 316 | handle_permit(const char **opts, char ***permitsp, size_t *npermitsp, |
317 | const char **errstrp) | 317 | const char **errstrp) |
318 | { | 318 | { |
319 | char *opt, *tmp, *cp, *host, **permits = *permitsp; | 319 | char *opt, *tmp, *cp, *host, **permits = *permitsp; |
@@ -324,7 +324,7 @@ handle_permit(const char *opts, char ***permitsp, size_t *npermitsp, | |||
324 | *errstrp = "too many permission directives"; | 324 | *errstrp = "too many permission directives"; |
325 | return -1; | 325 | return -1; |
326 | } | 326 | } |
327 | if ((opt = opt_dequote(&opts, &errstr)) == NULL) { | 327 | if ((opt = opt_dequote(opts, &errstr)) == NULL) { |
328 | return -1; | 328 | return -1; |
329 | } | 329 | } |
330 | if ((tmp = strdup(opt)) == NULL) { | 330 | if ((tmp = strdup(opt)) == NULL) { |
@@ -474,11 +474,11 @@ sshauthopt_parse(const char *opts, const char **errstrp) | |||
474 | } | 474 | } |
475 | ret->env[ret->nenv++] = opt; | 475 | ret->env[ret->nenv++] = opt; |
476 | } else if (opt_match(&opts, "permitopen")) { | 476 | } else if (opt_match(&opts, "permitopen")) { |
477 | if (handle_permit(opts, &ret->permitopen, | 477 | if (handle_permit(&opts, &ret->permitopen, |
478 | &ret->npermitopen, &errstr) != 0) | 478 | &ret->npermitopen, &errstr) != 0) |
479 | goto fail; | 479 | goto fail; |
480 | } else if (opt_match(&opts, "permitlisten")) { | 480 | } else if (opt_match(&opts, "permitlisten")) { |
481 | if (handle_permit(opts, &ret->permitlisten, | 481 | if (handle_permit(&opts, &ret->permitlisten, |
482 | &ret->npermitlisten, &errstr) != 0) | 482 | &ret->npermitlisten, &errstr) != 0) |
483 | goto fail; | 483 | goto fail; |
484 | } else if (opt_match(&opts, "tunnel")) { | 484 | } else if (opt_match(&opts, "tunnel")) { |