-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

FYI, Dag-Erling have committed the upstream fix to -HEAD today and we
will make sure that this gets merged before 9.2-RELEASE.

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;

Cheers,
- -- 
Xin LI <delp...@delphij.net>    https://www.delphij.net/
FreeBSD - The Power to Serve!           Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)

iQEcBAEBCgAGBQJSCrEpAAoJEG80Jeu8UPuzOsMIALKkg0+g2IhX5dAxGL9UU6AT
7/f/iEfDIYmTv1QRwZQ1B544Mf02NmSztEmVz5pwQCsSmw+rmF27t6iBbN6q5ipM
XUB+A3VsAGRmI8j/2ixwzs3AXTAdC/uhgswVMQyiuS35cYaArGAirZWxUESGIiqk
K7Hnc8vYDWZ+hbNIpPFNNvsdunltq42BJ5kHh07X3elqR7lJaGC7qQM8IoHo90nG
R4GPagM6tbuXdB/UzrW0ozgRf4VqE+SFCC8UAnnE/E61h7Fb0/GkD0XlsdTFrl3f
0Aadhs+jfwxV7UJgyGvuep9RsFuM/mUMHXAw8K3vuPbF6KA9U7XI1KmS8ym5G3A=
=ERoe
-----END PGP SIGNATURE-----
_______________________________________________
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"

Reply via email to