summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-01-09 15:56:45 +1100
committerDamien Miller <djm@mindrot.org>2013-01-09 15:56:45 +1100
commit441384453c7400e8b122e7368c50ab713399fd80 (patch)
treee89d7db38180bae2db4fc86fab3e6ca846fd804d
parent697485d50af953d36503c11d9e549dd0db8a3287 (diff)
- 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@
-rw-r--r--ChangeLog5
-rw-r--r--servconf.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35a29d51a..66cc48ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@
11 [PROTOCOL.agent] 11 [PROTOCOL.agent]
12 correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED 12 correct format description for SSH_AGENTC_ADD_RSA_ID_CONSTRAINED
13 bz#2051 from david AT lechnology.com 13 bz#2051 from david AT lechnology.com
14 - djm@cvs.openbsd.org 2013/01/03 05:49:36
15 [servconf.h]
16 add a couple of ServerOptions members that should be copied to the privsep
17 child (for consistency, in this case they happen only to be accessed in
18 the monitor); ok dtucker@
14 19
1520121217 2020121217
16 - (dtucker) [Makefile.in] Add some scaffolding so that the new regress 21 - (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 @@
1/* $OpenBSD: servconf.h,v 1.106 2012/12/02 20:46:11 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.107 2013/01/03 05:49:36 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -203,6 +203,8 @@ struct connection_info {
203 M_CP_STROPT(trusted_user_ca_keys); \ 203 M_CP_STROPT(trusted_user_ca_keys); \
204 M_CP_STROPT(revoked_keys_file); \ 204 M_CP_STROPT(revoked_keys_file); \
205 M_CP_STROPT(authorized_principals_file); \ 205 M_CP_STROPT(authorized_principals_file); \
206 M_CP_STROPT(authorized_keys_command); \
207 M_CP_STROPT(authorized_keys_command_user); \
206 M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ 208 M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \
207 M_CP_STRARRAYOPT(allow_users, num_allow_users); \ 209 M_CP_STRARRAYOPT(allow_users, num_allow_users); \
208 M_CP_STRARRAYOPT(deny_users, num_deny_users); \ 210 M_CP_STRARRAYOPT(deny_users, num_deny_users); \