===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth-options.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- src/usr.bin/ssh/auth-options.c	2018/06/07 04:31:51	1.81
+++ src/usr.bin/ssh/auth-options.c	2018/06/07 09:26:42	1.82
@@ -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>
  *
@@ -310,7 +310,7 @@
  * 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;
@@ -321,7 +321,7 @@
 		*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) {
@@ -846,7 +846,7 @@
 	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;