X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/f8db3345ba73482b52352c2d31d4fa9f162b883c..6c20a13fa59adcc58e5f78aeb2225a74724f5cc9:/sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index a2df09f5..24c4ff71 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.80 2008/05/18 21:29:05 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.
  *
@@ -23,8 +23,12 @@
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
+#ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
+#endif
 
 #include <dirent.h>
 #include <errno.h>
@@ -100,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;
@@ -489,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_int(&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);
 }
@@ -521,10 +528,10 @@ process_init(void)
 	buffer_put_cstring(&msg, "1"); /* version */
 	/* statvfs extension */
 	buffer_put_cstring(&msg, "statvfs@openssh.com");
-	buffer_put_cstring(&msg, "1"); /* version */
+	buffer_put_cstring(&msg, "2"); /* version */
 	/* fstatvfs extension */
 	buffer_put_cstring(&msg, "fstatvfs@openssh.com");
-	buffer_put_cstring(&msg, "1"); /* version */
+	buffer_put_cstring(&msg, "2"); /* version */
 	send_msg(&msg);
 	buffer_free(&msg);
 }
@@ -756,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);
 	}
@@ -810,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);
@@ -963,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);
@@ -1035,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