From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 3 May 2016 15:25:06 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_3_P1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771c2f51ffc0c9a2877b7892fada0c77bd1f6549;p=thirdparty%2Fopenssh-portable.git

upstream commit

don't forget to include StreamLocalBindUnlink in the
 config dump output

Upstream-ID: 14a6d970b3b45c8e94272e3c661e9a0b2a0ee7cb
---

diff --git a/servconf.c b/servconf.c
index 6111c5a94..01750a6c8 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.287 2016/05/02 08:49:03 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.288 2016/05/03 15:25:06 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2293,6 +2293,7 @@ dump_config(ServerOptions *o)
 	dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding);
 	dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding);
 	dump_cfg_fmtint(sAllowStreamLocalForwarding, o->allow_streamlocal_forwarding);
+	dump_cfg_fmtint(sStreamLocalBindUnlink, o->fwd_opts.streamlocal_bind_unlink);
 	dump_cfg_fmtint(sUsePrivilegeSeparation, use_privsep);
 	dump_cfg_fmtint(sFingerprintHash, o->fingerprint_hash);