summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sftp.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 295c42abc..16bb10b4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 - jmc@cvs.openbsd.org 2013/08/07 06:24:51 15 - jmc@cvs.openbsd.org 2013/08/07 06:24:51
16 [sftp.1 sftp.c] 16 [sftp.1 sftp.c]
17 sort -a; 17 sort -a;
18 - djm@cvs.openbsd.org 2013/08/08 04:52:04
19 [sftp.c]
20 fix two year old regression: symlinking a file would incorrectly
21 canonicalise the target path. bz#2129 report from delphij AT freebsd.org
18 22
1920130808 2320130808
20 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt 24 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/sftp.c b/sftp.c
index 4e1a026f7..6f16f7cc6 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.150 2013/08/07 06:24:51 jmc Exp $ */ 1/* $OpenBSD: sftp.c,v 1.151 2013/08/08 04:52:04 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -1358,7 +1358,8 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
1358 case I_SYMLINK: 1358 case I_SYMLINK:
1359 sflag = 1; 1359 sflag = 1;
1360 case I_LINK: 1360 case I_LINK:
1361 path1 = make_absolute(path1, *pwd); 1361 if (!sflag)
1362 path1 = make_absolute(path1, *pwd);
1362 path2 = make_absolute(path2, *pwd); 1363 path2 = make_absolute(path2, *pwd);
1363 err = (sflag ? do_symlink : do_hardlink)(conn, path1, path2); 1364 err = (sflag ? do_symlink : do_hardlink)(conn, path1, path2);
1364 break; 1365 break;