- dtucker@cvs.openbsd.org 2010/01/10 03:51:17

     [servconf.c]
     Add ChrootDirectory to sshd.c test-mode output

diff --git a/ChangeLog b/ChangeLog
index ca189f943ca3c3085310e7bc3f79c38c7831a6a6..8b419858dc998e58b834694d44b26ccad58926f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20091210
  - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
    Remove hacks add for RoutingDomain in preparation for its removal.
+ - (dtucker) OpenBSD CVS Sync
    - dtucker@cvs.openbsd.org 2010/01/09 23:04:13
      [channels.c ssh.1 servconf.c sshd_config.5 sshd.c channels.h servconf.h
      ssh-keyscan.1 ssh-keyscan.c readconf.c sshconnect.c misc.c ssh.c
@@ -14,6 +15,9 @@
      $ route -T 2 exec sh
      $ ssh 10.1.2.3
      ok deraadt@ markus@ stevesk@ reyk@
+   - dtucker@cvs.openbsd.org 2010/01/10 03:51:17
+     [servconf.c]
+     Add ChrootDirectory to sshd.c test-mode output
 
 20091209
  - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't

diff --git a/servconf.c b/servconf.c
index fc3e479bd7d9179725aee12bc78cd8b957fde892..b1964e865a1938ea139e632db2d730b5953a651c 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.200 2010/01/09 23:04:13 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.201 2010/01/10 03:51:17 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1626,6 +1626,7 @@ dump_config(ServerOptions *o)
        dump_cfg_string(sAuthorizedKeysFile, o->authorized_keys_file);
        dump_cfg_string(sAuthorizedKeysFile2, o->authorized_keys_file2);
        dump_cfg_string(sForceCommand, o->adm_forced_command);
+       dump_cfg_string(sChrootDirectory, o->chroot_directory);
 
        /* string arguments requiring a lookup */
        dump_cfg_string(sLogLevel, log_level_name(o->log_level));