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 6d41815e202fbd6182c79780b6cc90e1ec1c9981
Author: djm@openbsd.org <djm@openbsd.org>
Date: Thu Jun 7 09:26:42 2018 +0000

upstream: some permitlisten fixes from markus@ that I missed in my

insomnia-fueled commits last night

OpenBSD-Commit-ID: 26f23622e928996086e85b1419cc1c0f136e359c
---
auth-options.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/auth-options.c b/auth-options.c
index fe6432f5..151b16ec 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.81 2018/06/07 04:31:51 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.82 2018/06/07 09:26:42 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 **optsp, 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(optsp, &errstr)) == NULL) {
return -1;
}
if ((tmp = strdup(opt)) == NULL) {
@@ -849,7 +849,7 @@ sshauthopt_serialise(const struct sshauthopt *opts, struct sshbuf *m,
if ((r = serialise_array(m, opts->env,
untrusted ? 0 : opts->nenv)) != 0 ||
(r = serialise_array(m, opts->permitopen,
- untrusted ? 0 : opts->npermitopen)) ||
+ untrusted ? 0 : opts->npermitopen)) != 0 ||
(r = serialise_array(m, opts->permitlisten,
untrusted ? 0 : opts->npermitlisten)) != 0)
return r;

--
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