- (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link

   returns EXDEV.  Patch from Mike Garrison, ok djm@

diff --git a/ChangeLog b/ChangeLog
index c1f3e96ab3be6573948bd585340b94bfdef1d313..055bce9ef5d71780df580e710168a7e8f51390d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
    - dtucker@cvs.openbsd.org 2008/07/04 03:47:02
      [monitor.c]
      Make debug a little clearer.  ok djm@
+ - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
+   returns EXDEV.  Patch from Mike Garrison, ok djm@
 
 20080702
  - (dtucker) OpenBSD CVS Sync

diff --git a/sftp-server.c b/sftp-server.c
index a4c4f168fc3f929827a04626f8ae579f8c6bae3f..24c4ff717227550f0c25fd2cc9df2153321f0d06 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1042,6 +1042,9 @@ process_rename(void)
                /* Race-free rename of regular files */
                if (link(oldpath, newpath) == -1) {
                        if (errno == EOPNOTSUPP
+#ifdef EXDEV
+                           || errno == EXDEV
+#endif
 #ifdef LINK_OPNOTSUPP_ERRNO
                            || errno == LINK_OPNOTSUPP_ERRNO
 #endif