summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/auth.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-09-12 06:32:07 +0000
committerdjm <djm@openbsd.org>2017-09-12 06:32:07 +0000
commit7b28dfb0e569599ccd686236ca62c09e050d622d (patch)
tree3da77707137c909a7d9e401b6edc4c32b712c793 /usr.bin/ssh/auth.c
parentrename setredzone to setguardpage. (diff)
downloadwireguard-openbsd-7b28dfb0e569599ccd686236ca62c09e050d622d.tar.xz
wireguard-openbsd-7b28dfb0e569599ccd686236ca62c09e050d622d.zip
refactor channels.c
Move static state to a "struct ssh_channels" that is allocated at runtime and tracked as a member of struct ssh. Explicitly pass "struct ssh" to all channels functions. Replace use of the legacy packet APIs in channels.c. Rework sshd_config PermitOpen handling: previously the configuration parser would call directly into the channels layer. After the refactor this is not possible, as the channels structures are allocated at connection time and aren't available when the configuration is parsed. The server config parser now tracks PermitOpen itself and explicitly configures the channels code later. ok markus@
Diffstat (limited to 'usr.bin/ssh/auth.c')
-rw-r--r--usr.bin/ssh/auth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c
index 6dac729afa6..5abae6d5d69 100644
--- a/usr.bin/ssh/auth.c
+++ b/usr.bin/ssh/auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.123 2017/08/18 05:36:45 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.124 2017/09/12 06:32:07 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -473,6 +473,7 @@ getpwnamallow(const char *user)
ci->user = user;
parse_server_match_config(&options, ci);
log_change_level(options.log_level);
+ process_permitopen(ssh, &options);
pw = getpwnam(user);
if (pw == NULL) {