summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-14 13:34:46 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-15 05:22:41 +0200
commitb27f88898aa604d70d212c524549bb2cfc929170 (patch)
tree208eef56121d2d75d713414b3247df000daa4270
parent67108c8e7eb89ca69247f7865e9a9885fbd441eb (diff)
downloadsamba-b27f88898aa604d70d212c524549bb2cfc929170.tar.gz
samba-b27f88898aa604d70d212c524549bb2cfc929170.tar.bz2
samba-b27f88898aa604d70d212c524549bb2cfc929170.zip
s3:vfs: change files_struct.fnum from int to uint64_t
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri Jun 15 05:22:41 CEST 2012 on sn-devel-104
-rw-r--r--source3/include/vfs.h2
-rw-r--r--source3/lib/filename_util.c3
-rw-r--r--source3/smbd/smb2_break.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 3062aa13a6..723eb6c826 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -185,7 +185,7 @@ struct fd_handle {
typedef struct files_struct {
struct files_struct *next, *prev;
- int fnum;
+ uint64_t fnum;
struct connection_struct *conn;
struct fd_handle *fh;
unsigned int num_smb_operations;
diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c
index fe43be6dc2..9a6ab2b34a 100644
--- a/source3/lib/filename_util.c
+++ b/source3/lib/filename_util.c
@@ -151,7 +151,8 @@ const char *fsp_fnum_dbg(const struct files_struct *fsp)
return "fnum [invalid value]";
}
- str = talloc_asprintf(talloc_tos(), "fnum %d", fsp->fnum);
+ str = talloc_asprintf(talloc_tos(), "fnum %llu",
+ (unsigned long long)fsp->fnum);
if (str == NULL) {
DEBUG(1, ("%s: talloc_asprintf failed\n", __FUNCTION__));
return "fnum [talloc failed!]";
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index bf84b3a563..95e1d8b537 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -247,7 +247,7 @@ void send_break_message_smb2(files_struct *fsp, int level)
status = smbd_smb2_send_oplock_break(fsp->conn->sconn,
fsp_persistent,
- (uint64_t)fsp->fnum,
+ fsp->fnum,
smb2_oplock_level);
if (!NT_STATUS_IS_OK(status)) {
smbd_server_connection_terminate(fsp->conn->sconn,