svn commit: r254278 - head/crypto/openssh

[Dag-Erling Smørgrav]

Author: des
Date: Tue Aug 13 09:06:18 2013
New Revision: 254278
URL: http://svnweb.freebsd.org/changeset/base/254278

Log:
  Apply upstream revision 1.151 (fix relative symlinks)
  
  MFC after:	3 days

Modified:
  head/crypto/openssh/sftp.c
Directory Properties:
  head/crypto/openssh/   (props changed)

Modified: head/crypto/openssh/sftp.c
==============================================================================
--- head/crypto/openssh/sftp.c	Tue Aug 13 09:04:20 2013	(r254277)
+++ head/crypto/openssh/sftp.c	Tue Aug 13 09:06:18 2013	(r254278)
@@ -1328,7 +1328,8 @@ parse_dispatch_command(struct sftp_conn 
 	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;