From owner-svn-src-head@FreeBSD.ORG  Tue Aug 13 09:06:19 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 178D081A;
 Tue, 13 Aug 2013 09:06:19 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04FC62610;
 Tue, 13 Aug 2013 09:06:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7D96Ixo021480;
 Tue, 13 Aug 2013 09:06:18 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7D96IWT021479;
 Tue, 13 Aug 2013 09:06:18 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201308130906.r7D96IWT021479@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Tue, 13 Aug 2013 09:06:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254278 - head/crypto/openssh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 09:06:19 -0000

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;