summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-05 13:17:26 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-06 10:18:40 +0200
commit37bfadf4a389369632e86e3446f37f54a436848f (patch)
treee1e5045996a455de6c635c5c7fca4a2be552ed91
parent5a260a1d58a56054762fee17ca66e0f87a5aac85 (diff)
downloadsamba-37bfadf4a389369632e86e3446f37f54a436848f.tar.gz
samba-37bfadf4a389369632e86e3446f37f54a436848f.tar.bz2
samba-37bfadf4a389369632e86e3446f37f54a436848f.zip
s3:include: change files_struct->vuid to uint64_t
metze
-rw-r--r--source3/include/vfs.h2
-rw-r--r--source3/smbd/ipc.c3
-rw-r--r--source3/smbd/open.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index bde644fa8c..360f817d68 100644
--- 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 3d9b174cf9..083c6882a7 100644
--- 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 c42835665b..a03109282e 100644
--- 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 ));