s3:include: change connection_struct->cnum to uint32_t

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index fbb236dc27f751512b205aa977958efb6bd4e32c..3062aa13a6cb8b89b184b43f350c9f606e24ca03 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -280,7 +280,7 @@ struct share_params {
 typedef struct connection_struct {
        struct connection_struct *next, *prev;
        struct smbd_server_connection *sconn; /* can be NULL */
-       unsigned cnum; /* an index passed over the wire */
+       uint32_t cnum; /* an index passed over the wire */
        struct share_params *params;
        bool force_user;
        struct vuid_cache vuid_cache;

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 289e5d13c77f7b6290b199ee0ad609df9129c5de..adf1f5194c88099e304a29d95d6978d568619a54 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1486,7 +1486,7 @@ void brl_close_fnum(struct messaging_context *msg_ctx,
                    struct byte_range_lock *br_lck)
 {
        files_struct *fsp = br_lck->fsp;
-       uint16 tid = fsp->conn->cnum;
+       uint32_t tid = fsp->conn->cnum;
        int fnum = fsp->fnum;
        unsigned int i;
        struct lock_struct *locks = br_lck->lock_data;

diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c
index 53d85531223a1341568d3409ff8b9c17eff6d4d7..399935a96451215eaa108d84a144393dd2fa4d77 100644 (file)
--- a/source3/smbd/conn.c
+++ b/source3/smbd/conn.c
@@ -71,7 +71,7 @@ bool conn_snum_used(struct smbd_server_connection *sconn,
  Find a conn given a cnum.
 ****************************************************************************/
 
-connection_struct *conn_find(struct smbd_server_connection *sconn,unsigned cnum)
+connection_struct *conn_find(struct smbd_server_connection *sconn, uint32_t cnum)
 {
        size_t count=0;
        struct connection_struct *conn;

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index d58115703d3b7ac16cfa1c75d25744ad7452626e..b527d208b6ecd1dbc1057d04a50f23fdb36f708f 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -147,7 +147,7 @@ void conn_init(struct smbd_server_connection *sconn);
 int conn_num_open(struct smbd_server_connection *sconn);
 bool conn_snum_used(struct smbd_server_connection *sconn, int snum);
 connection_struct *conn_find(struct smbd_server_connection *sconn,
-                            unsigned cnum);
+                            uint32_t cnum);
 connection_struct *conn_new(struct smbd_server_connection *sconn);
 void conn_close_all(struct smbd_server_connection *sconn);
 bool conn_idle_all(struct smbd_server_connection *sconn, time_t t);