summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 433811521..7850f2f59 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.300 2018/10/05 14:26:09 naddy Exp $ */ 1/* $OpenBSD: readconf.c,v 1.301 2018/11/16 03:26:01 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1521,7 +1521,7 @@ parse_keytypes:
1521 if (*arg == '~' && (flags & SSHCONF_USERCONF) == 0) 1521 if (*arg == '~' && (flags & SSHCONF_USERCONF) == 0)
1522 fatal("%.200s line %d: bad include path %s.", 1522 fatal("%.200s line %d: bad include path %s.",
1523 filename, linenum, arg); 1523 filename, linenum, arg);
1524 if (*arg != '/' && *arg != '~') { 1524 if (!path_absolute(arg) && *arg != '~') {
1525 xasprintf(&arg2, "%s/%s", 1525 xasprintf(&arg2, "%s/%s",
1526 (flags & SSHCONF_USERCONF) ? 1526 (flags & SSHCONF_USERCONF) ?
1527 "~/" _PATH_SSH_USER_DIR : SSHDIR, arg); 1527 "~/" _PATH_SSH_USER_DIR : SSHDIR, arg);