1 files changed, 10 insertions, 4 deletions

diff --git a/auth-options.c b/auth-options.c
index 7eb87b352..ccdd0b20a 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.72 2016/11/30 02:57:40 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.74 2017/09/12 06:32:07 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -65,6 +65,8 @@ int logged_cert_hostip = 0;
 
 extern ServerOptions options;
 
+/* XXX refactor to be stateless */
+
 void
 auth_start_parse_options(void)
 {
@@ -75,6 +77,8 @@ auth_start_parse_options(void)
 void
 auth_clear_options(void)
 {
+        struct ssh *ssh = active_state;         /* XXX */
+
         no_agent_forwarding_flag = 0;
         no_port_forwarding_flag = 0;
         no_pty_flag = 0;
@@ -92,7 +96,7 @@ auth_clear_options(void)
         free(authorized_principals);
         authorized_principals = NULL;
         forced_tun_device = -1;
-        channel_clear_permitted_opens();
+        channel_clear_permitted_opens(ssh);
 }
 
 /*
@@ -128,9 +132,11 @@ match_flag(const char *opt, int allow_negate, char **optsp, const char *msg)
 /*
  * return 1 if access is granted, 0 if not.
  * side effect: sets key option flags
+ * XXX remove side effects; fill structure instead.
  */
 int
-auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
+auth_parse_options(struct passwd *pw, char *opts, const char *file,
+    u_long linenum)
 {
         struct ssh *ssh = active_state;         /* XXX */
         const char *cp;
@@ -393,7 +399,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 goto bad_option;
                         }
                         if ((options.allow_tcp_forwarding & FORWARD_LOCAL) != 0)
-                                channel_add_permitted_opens(host, port);
+                                channel_add_permitted_opens(ssh, host, port);
                         free(patterns);
                         goto next_option;
                 }