X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Ftorture%2Fcmd_vfs.c;h=31eb27b7568b240da3f76f9689b95f24e043b80a;hb=48b0016cff4bad621b94fc0bf678ec15260dd7d7;hp=28400887ef720f4331a7f738ea419e4b7826cfa0;hpb=0db7aba8af80a01150d1061a4192ab814e4234b7;p=metze%2Fsamba%2Fwip.git

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 28400887ef72..31eb27b7568b 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -105,7 +105,7 @@ static NTSTATUS cmd_disconnect(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int a
 
 static NTSTATUS cmd_disk_free(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
-	SMB_BIG_UINT diskfree, bsize, dfree, dsize;
+	uint64_t diskfree, bsize, dfree, dsize;
 	if (argc != 2) {
 		printf("Usage: disk_free <path>\n");
 		return NT_STATUS_OK;
@@ -272,7 +272,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
 		flagstr++;
 	}
 	if ((flags & O_CREAT) && argc == 4) {
-		if (sscanf(argv[3], "%o", &mode) == 0) {
+		if (sscanf(argv[3], "%ho", (unsigned short *)&mode) == 0) {
 			printf("open: error=-1 (invalid mode!)\n");
 			return NT_STATUS_UNSUCCESSFUL;
 		}
@@ -795,14 +795,17 @@ static NTSTATUS cmd_getwd(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 
 static NTSTATUS cmd_utime(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
-	struct timespec ts[2];
+	struct smb_file_time ft;
 	if (argc != 4) {
 		printf("Usage: utime <path> <access> <modify>\n");
 		return NT_STATUS_OK;
 	}
-	ts[0] = convert_time_t_to_timespec(atoi(argv[2]));
-	ts[1] = convert_time_t_to_timespec(atoi(argv[3]));
-	if (SMB_VFS_NTIMES(vfs->conn, argv[1], ts) != 0) {
+
+	ZERO_STRUCT(ft);
+
+	ft.atime = convert_time_t_to_timespec(atoi(argv[2]));
+	ft.mtime = convert_time_t_to_timespec(atoi(argv[3]));
+	if (SMB_VFS_NTIMES(vfs->conn, argv[1], &ft) != 0) {
 		printf("utime: error=%d (%s)\n", errno, strerror(errno));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -989,7 +992,7 @@ static NTSTATUS cmd_mknod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 		return NT_STATUS_OK;
 	}
 
-	if (sscanf(argv[2], "%o", &mode) == 0) {
+	if (sscanf(argv[2], "%ho", (unsigned short *)&mode) == 0) {
 		printf("open: error=-1 (invalid mode!)\n");
 		return NT_STATUS_UNSUCCESSFUL;
 	}