From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 6 Mar 2020 18:29:54 +0000 (+0000)
Subject: upstream: fix relative includes in sshd_config; ok djm
X-Git-Tag: V_8_3_P1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bdc3bb7cf4c82c3344cfcb82495a43406e87e83;p=thirdparty%2Fopenssh-portable.git

upstream: fix relative includes in sshd_config; ok djm

OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b
---

diff --git a/servconf.c b/servconf.c
index 70f5f73f0..748db5dec 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.360 2020/01/31 22:42:45 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.361 2020/03/06 18:29:54 markus Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1977,7 +1977,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 			value++;
 			found = 0;
 			if (*arg2 != '/' && *arg2 != '~') {
-				xasprintf(&arg, "%s/%s", SSHDIR, arg);
+				xasprintf(&arg, "%s/%s", SSHDIR, arg2);
 			} else
 				arg = xstrdup(arg2);