Mailing List Archive

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit fa09076410ffc2d34d454145af23c790d728921e
Author: djm@openbsd.org <djm@openbsd.org>
Date: Thu Jun 7 04:31:51 2018 +0000

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
---
auth-options.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/auth-options.c b/auth-options.c
index c55c3ed0..fe6432f5 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -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>
*
@@ -313,7 +313,7 @@ sshauthopt_new_with_keys_defaults(void)
* Return 0 on success. Return -1 on failure and sets *errstrp to error reason.
*/
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)
{
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";
return -1;
}
- if ((opt = opt_dequote(&opts, &errstr)) == NULL) {
+ if ((opt = opt_dequote(opts, &errstr)) == NULL) {
return -1;
}
if ((tmp = strdup(opt)) == NULL) {
@@ -474,11 +474,11 @@ sshauthopt_parse(const char *opts, const char **errstrp)
}
ret->env[ret->nenv++] = opt;
} else if (opt_match(&opts, "permitopen")) {
- if (handle_permit(opts, &ret->permitopen,
+ if (handle_permit(&opts, &ret->permitopen,
&ret->npermitopen, &errstr) != 0)
goto fail;
} else if (opt_match(&opts, "permitlisten")) {
- if (handle_permit(opts, &ret->permitlisten,
+ if (handle_permit(&opts, &ret->permitlisten,
&ret->npermitlisten, &errstr) != 0)
goto fail;
} else if (opt_match(&opts, "tunnel")) {

--
To stop receiving notification emails like this one, please contact
djm@mindrot.org.
_______________________________________________
openssh-commits mailing list
openssh-commits@mindrot.org
https://lists.mindrot.org/mailman/listinfo/openssh-commits