summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-08-13 09:06:18 +0000
committerdes <des@FreeBSD.org>2013-08-13 09:06:18 +0000
commitf4100c62aa6a63af38d8f038dfc2d5078aa31968 (patch)
treec8e3b9a31250c5b377c18b6f6343720b375bbf3f /crypto
parentf5e56f1d52906682ee87a900ac93441ae686a654 (diff)
downloadFreeBSD-src-f4100c62aa6a63af38d8f038dfc2d5078aa31968.zip
FreeBSD-src-f4100c62aa6a63af38d8f038dfc2d5078aa31968.tar.gz
Apply upstream revision 1.151 (fix relative symlinks)
MFC after: 3 days
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/sftp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c
index 18539ef..d7cbb03 100644
--- a/crypto/openssh/sftp.c
+++ b/crypto/openssh/sftp.c
@@ -1328,7 +1328,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
case I_SYMLINK:
sflag = 1;
case I_LINK:
- path1 = make_absolute(path1, *pwd);
+ if (!sflag)
+ path1 = make_absolute(path1, *pwd);
path2 = make_absolute(path2, *pwd);
err = (sflag ? do_symlink : do_hardlink)(conn, path1, path2);
break;
OpenPOWER on IntegriCloud