]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: fix relative includes in sshd_config; ok djm
authormarkus@openbsd.org <markus@openbsd.org>
Fri, 6 Mar 2020 18:29:54 +0000 (18:29 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 13 Mar 2020 02:18:31 +0000 (13:18 +1100)
OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b

servconf.c

index 70f5f73f051921f1bc80573c514144e7e8995583..748db5decb719a2165587031ab3be32f1a54e0df 100644 (file)
@@ -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);