diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2020-03-06 18:29:54 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-03-13 13:18:31 +1100 |
| commit | 8bdc3bb7cf4c82c3344cfcb82495a43406e87e83 (patch) | |
| tree | d5a575ea9efef019352c68952994052a705e4e46 /servconf.c | |
| parent | e32ef97a56ae03febfe307688858badae3a70e5a (diff) | |
upstream: fix relative includes in sshd_config; ok djm
OpenBSD-Commit-ID: fa29b0da3c93cbc3a1d4c6bcd58af43c00ffeb5b
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 70f5f73f0..748db5dec 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | 1 | ||
| 2 | /* $OpenBSD: servconf.c,v 1.360 2020/01/31 22:42:45 djm Exp $ */ | 2 | /* $OpenBSD: servconf.c,v 1.361 2020/03/06 18:29:54 markus Exp $ */ |
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 5 | * All rights reserved | 5 | * All rights reserved |
| @@ -1977,7 +1977,7 @@ process_server_config_line_depth(ServerOptions *options, char *line, | |||
| 1977 | value++; | 1977 | value++; |
| 1978 | found = 0; | 1978 | found = 0; |
| 1979 | if (*arg2 != '/' && *arg2 != '~') { | 1979 | if (*arg2 != '/' && *arg2 != '~') { |
| 1980 | xasprintf(&arg, "%s/%s", SSHDIR, arg); | 1980 | xasprintf(&arg, "%s/%s", SSHDIR, arg2); |
| 1981 | } else | 1981 | } else |
| 1982 | arg = xstrdup(arg2); | 1982 | arg = xstrdup(arg2); |
| 1983 | 1983 | ||