summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-06 15:28:14 +0200
committerMichael Adam <obnox@samba.org>2012-06-06 19:37:14 +0200
commit43890972945f19fdf0f009eec03e7d493b2760e9 (patch)
tree5183356d3a455bab73639e09d8d0dfd7296f2bfe
parent86f621488aae89856a9c6ae5a91ae5bf96302659 (diff)
downloadsamba-43890972945f19fdf0f009eec03e7d493b2760e9.tar.gz
samba-43890972945f19fdf0f009eec03e7d493b2760e9.tar.bz2
samba-43890972945f19fdf0f009eec03e7d493b2760e9.zip
s3:include: change connection_struct->cnum to uint32_t
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/include/vfs.h2
-rw-r--r--source3/locking/brlock.c2
-rw-r--r--source3/smbd/conn.c2
-rw-r--r--source3/smbd/proto.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index fbb236dc27..3062aa13a6 100644
--- 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 289e5d13c7..adf1f5194c 100644
--- 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 53d8553122..399935a964 100644
--- 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 d58115703d..b527d208b6 100644
--- 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);