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

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 3062aa13a6cb8b89b184b43f350c9f606e24ca03..723eb6c826bdbfb1b204fa564dff771ad3133624 100644 (file)
--- 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 fe43be6dc22492c2af625f3ad3221a54964277cf..9a6ab2b34a97da09e335167000aa393a6405c090 100644 (file)
--- 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 bf84b3a563676e599d9f5d8e87398bcf2e6cf0c1..95e1d8b5371c54f3838a61c3c7e1ed353c2d6f81 100644 (file)
--- 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,