tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix regression caused by recent permitlisten option commit: 

authorized_keys lines that contained permitopen/permitlisten were being
treated as invalid.

OpenBSD-Commit-ID: 7ef41d63a5a477b405d142dc925b67d9e7aaa31b
This commit is contained in:
djm@openbsd.org 2018-06-07 04:31:51 +00:00 committed by Damien Miller
parent 7f90635216
commit fa09076410
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
auth-options.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-options.c,v 1.80 2018/06/06 18:23:32 djm Exp $ */ /* $OpenBSD: auth-options.c,v 1.81 2018/06/07 04:31:51 djm Exp $ */
/* /*
* Copyright (c) 2018 Damien Miller <djm@mindrot.org> * Copyright (c) 2018 Damien Miller <djm@mindrot.org>
* *
@ -313,7 +313,7 @@ sshauthopt_new_with_keys_defaults(void)
* Return 0 on success. Return -1 on failure and sets *errstrp to error reason. * Return 0 on success. Return -1 on failure and sets *errstrp to error reason.
*/ */
static int static int
handle_permit(const char *opts, char ***permitsp, size_t *npermitsp, handle_permit(const char **opts, char ***permitsp, size_t *npermitsp,
const char **errstrp) const char **errstrp)
{ {
char *opt, *tmp, *cp, *host, **permits = *permitsp; char *opt, *tmp, *cp, *host, **permits = *permitsp;
@ -324,7 +324,7 @@ handle_permit(const char *opts, char ***permitsp, size_t *npermitsp,
*errstrp = "too many permission directives"; *errstrp = "too many permission directives";
return -1; return -1;
} }
if ((opt = opt_dequote(&opts, &errstr)) == NULL) { if ((opt = opt_dequote(opts, &errstr)) == NULL) {
return -1; return -1;
} }
if ((tmp = strdup(opt)) == NULL) { if ((tmp = strdup(opt)) == NULL) {
@ -474,11 +474,11 @@ sshauthopt_parse(const char *opts, const char **errstrp)
} }
ret->env[ret->nenv++] = opt; ret->env[ret->nenv++] = opt;
} else if (opt_match(&opts, "permitopen")) { } else if (opt_match(&opts, "permitopen")) {
if (handle_permit(opts, &ret->permitopen, if (handle_permit(&opts, &ret->permitopen,
&ret->npermitopen, &errstr) != 0) &ret->npermitopen, &errstr) != 0)
goto fail; goto fail;
} else if (opt_match(&opts, "permitlisten")) { } else if (opt_match(&opts, "permitlisten")) {
if (handle_permit(opts, &ret->permitlisten, if (handle_permit(&opts, &ret->permitlisten,
&ret->npermitlisten, &errstr) != 0) &ret->npermitlisten, &errstr) != 0)
goto fail; goto fail;
} else if (opt_match(&opts, "tunnel")) { } else if (opt_match(&opts, "tunnel")) {