From 441384453c7400e8b122e7368c50ab713399fd80 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 9 Jan 2013 15:56:45 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2013/01/03 05:49:36 [servconf.h] add a couple of ServerOptions members that should be copied to the privsep child (for consistency, in this case they happen only to be accessed in the monitor); ok dtucker@ --- ChangeLog | 5 +++++ servconf.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 35a29d51a..66cc48ba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ [PROTOCOL.agent] correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED bz#2051 from david AT lechnology.com + - djm@cvs.openbsd.org 2013/01/03 05:49:36 + [servconf.h] + add a couple of ServerOptions members that should be copied to the privsep + child (for consistency, in this case they happen only to be accessed in + the monitor); ok dtucker@ 20121217 - (dtucker) [Makefile.in] Add some scaffolding so that the new regress diff --git a/servconf.h b/servconf.h index a23ef7f3a..870c70982 100644 --- a/servconf.h +++ b/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.106 2012/12/02 20:46:11 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.107 2013/01/03 05:49:36 djm Exp $ */ /* * Author: Tatu Ylonen @@ -203,6 +203,8 @@ struct connection_info { M_CP_STROPT(trusted_user_ca_keys); \ M_CP_STROPT(revoked_keys_file); \ M_CP_STROPT(authorized_principals_file); \ + M_CP_STROPT(authorized_keys_command); \ + M_CP_STROPT(authorized_keys_command_user); \ M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ M_CP_STRARRAYOPT(allow_users, num_allow_users); \ M_CP_STRARRAYOPT(deny_users, num_deny_users); \