s3:include: change files_struct->vuid to uint64_t

metze

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index bde644fa8c5d4400dfe3bfee11fa74dec3af5643..360f817d68f44f621ef03635823a41cb9596808b 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -192,7 +192,7 @@ typedef struct files_struct {
        struct file_id file_id;
        uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
        uint16 file_pid;
-       uint16 vuid;
+       uint64_t vuid; /* SMB2 compat */
        struct write_cache *wcp;
        struct timeval open_time;
        uint32 access_mask;             /* NTCreateX access bits (FILE_READ_DATA etc.) */

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 3d9b174cf98968f0245a809e3175c62cfaea2c8e..083c6882a70fee9383f5e9ee42105c1ca4b96f62 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -494,7 +494,8 @@ static void api_fd_reply(connection_struct *conn, uint16 vuid,
 
        if (vuid != fsp->vuid) {
                DEBUG(1, ("Got pipe request (pnum %x) using invalid VUID %d, "
-                         "expected %d\n", pnum, vuid, fsp->vuid));
+                         "expected %llu\n", pnum, vuid,
+                         (unsigned long long)fsp->vuid));
                reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                return;
        }

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index c42835665b48a978e12fb8cd2e8bac94439817a7..a03109282ed3fbb21aeb13a6c188c74dc88541e1 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1442,9 +1442,9 @@ static NTSTATUS fcb_or_dos_open(struct smb_request *req,
            fsp = file_find_di_next(fsp)) {
 
                DEBUG(10,("fcb_or_dos_open: checking file %s, fd = %d, "
-                         "vuid = %u, file_pid = %u, private_options = 0x%x "
+                         "vuid = %llu, file_pid = %u, private_options = 0x%x "
                          "access_mask = 0x%x\n", fsp_str_dbg(fsp),
-                         fsp->fh->fd, (unsigned int)fsp->vuid,
+                         fsp->fh->fd, (unsigned long long)fsp->vuid,
                          (unsigned int)fsp->file_pid,
                          (unsigned int)fsp->fh->private_options,
                          (unsigned int)fsp->access_mask ));