From owner-svn-src-all@FreeBSD.ORG Tue Aug 13 09:04:20 2013 Return-Path: <owner-svn-src-all@FreeBSD.ORG> Delivered-To: svn-src-all@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 A4E5B69F; Tue, 13 Aug 2013 09:04:20 +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 9263C25F4; Tue, 13 Aug 2013 09:04:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7D94Kg0021071; Tue, 13 Aug 2013 09:04:20 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7D94Kk3021070; Tue, 13 Aug 2013 09:04:20 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201308130904.r7D94Kk3021070@svn.freebsd.org> From: Dag-Erling Smørgrav <des@FreeBSD.org> Date: Tue, 13 Aug 2013 09:04:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r254277 - vendor-crypto/openssh/dist X-SVN-Group: vendor-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all> List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 13 Aug 2013 09:04:20 -0000 Author: des Date: Tue Aug 13 09:04:20 2013 New Revision: 254277 URL: http://svnweb.freebsd.org/changeset/base/254277 Log: Apply upstream revision 1.151 (fix relative symlinks) Modified: vendor-crypto/openssh/dist/sftp.c Modified: vendor-crypto/openssh/dist/sftp.c ============================================================================== --- vendor-crypto/openssh/dist/sftp.c Tue Aug 13 08:12:57 2013 (r254276) +++ vendor-crypto/openssh/dist/sftp.c Tue Aug 13 09:04:20 2013 (r254277) @@ -1327,7 +1327,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;