1 files changed, 12 insertions, 1 deletions

diff --git a/servconf.c b/servconf.c
index 17cb094c7..19c68e2d7 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.282 2015/10/29 08:05:01 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.283 2015/11/13 04:38:06 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -373,6 +373,8 @@ fill_default_server_options(ServerOptions *options)
         CLEAR_ON_NONE(options->trusted_user_ca_keys);
         CLEAR_ON_NONE(options->revoked_keys_file);
         CLEAR_ON_NONE(options->authorized_principals_file);
+        CLEAR_ON_NONE(options->adm_forced_command);
+        CLEAR_ON_NONE(options->chroot_directory);
         for (i = 0; i < options->num_host_key_files; i++)
                 CLEAR_ON_NONE(options->host_key_files[i]);
         for (i = 0; i < options->num_host_cert_files; i++)
@@ -2034,8 +2036,17 @@ copy_set_server_options(ServerOptions *dst, ServerOptions *src, int preauth)
         if (preauth)
                 return;
 
+        /* These options may be "none" to clear a global setting */
         M_CP_STROPT(adm_forced_command);
+        if (option_clear_or_none(dst->adm_forced_command)) {
+                free(dst->adm_forced_command);
+                dst->adm_forced_command = NULL;
+        }
         M_CP_STROPT(chroot_directory);
+        if (option_clear_or_none(dst->chroot_directory)) {
+                free(dst->chroot_directory);
+                dst->chroot_directory = NULL;
+        }
 }
 
 #undef M_CP_INTOPT