diff options
| author |   markus <markus@openbsd.org> | 2020-03-06 18:29:54 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2020-03-06 18:29:54 +0000 |
| commit | 86fa05f4f51a3e4b2ceb6e86ba0d7a3a5ced82ce (patch) | |
| tree | 5038a9d9e612e80bc5568f34c91c6b537d6b3f21 | |
| parent | fix use-after-free in do_download_sk; ok djm (diff) | |
| download | wireguard-openbsd-86fa05f4f51a3e4b2ceb6e86ba0d7a3a5ced82ce.tar.xz wireguard-openbsd-86fa05f4f51a3e4b2ceb6e86ba0d7a3a5ced82ce.zip | |
fix relative includes in sshd_config; ok djm
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index dcfb4778f19..bd9404f22df 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/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 @@ -1910,7 +1910,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); |