diff options
author | Stefan Metzmacher <metze@samba.org> | 2005-12-06 17:59:20 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:09 -0500 |
commit | 273f340376452bd072b68d0601dde3f7b43b62db (patch) | |
tree | d62e422cedc3ab2fbcd67697db3cb4b5a4fa8c0d /source4/smb_server/smb | |
parent | 2184ad5af7f354dfb5f8addcb99e69fa2f79df01 (diff) | |
download | samba-273f340376452bd072b68d0601dde3f7b43b62db.tar.gz samba-273f340376452bd072b68d0601dde3f7b43b62db.tar.bz2 samba-273f340376452bd072b68d0601dde3f7b43b62db.zip |
r12102: for SMB2 we need to allocate tcons per session
metze
(This used to be commit 4d527ac005086c2db954578b4126ca128e436e01)
Diffstat (limited to 'source4/smb_server/smb')
-rw-r--r-- | source4/smb_server/smb/receive.c | 4 | ||||
-rw-r--r-- | source4/smb_server/smb/reply.c | 4 | ||||
-rw-r--r-- | source4/smb_server/smb/service.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index b77a166b9d..806244ee12 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -470,7 +470,7 @@ static void switch_message(int type, struct smbsrv_request *req) flags = smb_messages[type].flags; - req->tcon = smbsrv_tcon_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); + req->tcon = smbsrv_smb_tcon_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); if (!req->session) { /* setup the user context for this request if it @@ -645,7 +645,7 @@ NTSTATUS smbsrv_init_smb_connection(struct smbsrv_connection *smb_conn) status = smbsrv_init_sessions(smb_conn, UINT16_MAX); NT_STATUS_NOT_OK_RETURN(status); - status = smbsrv_init_tcons(smb_conn, UINT16_MAX); + status = smbsrv_smb_init_tcons(smb_conn); NT_STATUS_NOT_OK_RETURN(status); srv_init_signing(smb_conn); diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index eb7b5a1082..d780cb1a75 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -1200,7 +1200,7 @@ void reply_exit(struct smbsrv_request *req) struct smbsrv_tcon *tcon; REQ_CHECK_WCT(req, 0); - for (tcon=req->smb_conn->tcons.list;tcon;tcon=tcon->next) { + for (tcon=req->smb_conn->smb_tcons.list;tcon;tcon=tcon->next) { req->tcon = tcon; status = ntvfs_exit(req); req->tcon = NULL; @@ -2181,7 +2181,7 @@ void reply_ulogoffX(struct smbsrv_request *req) /* in user level security we are supposed to close any files open by this user on all open tree connects */ - for (tcon=req->smb_conn->tcons.list;tcon;tcon=tcon->next) { + for (tcon=req->smb_conn->smb_tcons.list;tcon;tcon=tcon->next) { req->tcon = tcon; status = ntvfs_logoff(req); req->tcon = NULL; diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c index 213cf6726b..6032e5a20d 100644 --- a/source4/smb_server/smb/service.c +++ b/source4/smb_server/smb/service.c @@ -66,7 +66,7 @@ static NTSTATUS make_connection_snum(struct smbsrv_request *req, return NT_STATUS_ACCESS_DENIED; } - tcon = smbsrv_tcon_new(req->smb_conn); + tcon = smbsrv_smb_tcon_new(req->smb_conn); if (!tcon) { DEBUG(0,("Couldn't find free connection.\n")); return NT_STATUS_INSUFFICIENT_RESOURCES; |