- stevesk@cvs.openbsd.org 2008/12/09 22:37:33

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 9c3128347825493355e8b094fadb958c7513f773..24c4ff717227550f0c25fd2cc9df2153321f0d06 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.81 2008/06/07 21:52:46 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.84 2008/06/26 06:10:09 djm Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -104,6 +104,9 @@ errno_to_portable(int unixerrno)
        case EINVAL:
                ret = SSH2_FX_BAD_MESSAGE;
                break;
+       case ENOSYS:
+               ret = SSH2_FX_OP_UNSUPPORTED;
+               break;
        default:
                ret = SSH2_FX_FAILURE;
                break;
@@ -493,17 +496,17 @@ send_statvfs(u_int32_t id, struct statvfs *st)
        buffer_init(&msg);
        buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY);
        buffer_put_int(&msg, id);
-       buffer_put_int(&msg, st->f_bsize);
-       buffer_put_int(&msg, st->f_frsize);
+       buffer_put_int64(&msg, st->f_bsize);
+       buffer_put_int64(&msg, st->f_frsize);
        buffer_put_int64(&msg, st->f_blocks);
        buffer_put_int64(&msg, st->f_bfree);
        buffer_put_int64(&msg, st->f_bavail);
        buffer_put_int64(&msg, st->f_files);
        buffer_put_int64(&msg, st->f_ffree);
        buffer_put_int64(&msg, st->f_favail);
-       buffer_put_int64(&msg, st->f_fsid);
-       buffer_put_int(&msg, flag);
-       buffer_put_int(&msg, st->f_namemax);
+       buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid));
+       buffer_put_int64(&msg, flag);
+       buffer_put_int64(&msg, st->f_namemax);
        send_msg(&msg);
        buffer_free(&msg);
 }
@@ -760,7 +763,7 @@ process_setstat(void)
        }
        if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
                logit("set \"%s\" mode %04o", name, a->perm);
-               ret = chmod(name, a->perm & 0777);
+               ret = chmod(name, a->perm & 07777);
                if (ret == -1)
                        status = errno_to_portable(errno);
        }
@@ -814,9 +817,9 @@ process_fsetstat(void)
                if (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) {
                        logit("set \"%s\" mode %04o", name, a->perm);
 #ifdef HAVE_FCHMOD
-                       ret = fchmod(fd, a->perm & 0777);
+                       ret = fchmod(fd, a->perm & 07777);
 #else
-                       ret = chmod(name, a->perm & 0777);
+                       ret = chmod(name, a->perm & 07777);
 #endif
                        if (ret == -1)
                                status = errno_to_portable(errno);
@@ -967,7 +970,7 @@ process_mkdir(void)
        name = get_string(NULL);
        a = get_attrib();
        mode = (a->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) ?
-           a->perm & 0777 : 0777;
+           a->perm & 07777 : 0777;
        debug3("request %u: mkdir", id);
        logit("mkdir name \"%s\" mode 0%o", name, mode);
        ret = mkdir(name, mode);
@@ -1039,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