diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-01-13 18:49:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:48 -0500 |
| commit | 592fce7fb149ca5e82b14d9c8f13a4da1babe2b7 (patch) | |
| tree | 6f5dba2cceef394c88ed052dab86dd355c21ec01 /source4/smb_server/smb_server.c | |
| parent | ada17c6794da2988fea7e800c60ca7e83d23eb7e (diff) | |
| download | samba-592fce7fb149ca5e82b14d9c8f13a4da1babe2b7.tar.gz samba-592fce7fb149ca5e82b14d9c8f13a4da1babe2b7.tar.bz2 samba-592fce7fb149ca5e82b14d9c8f13a4da1babe2b7.zip | |
r4726: - use the name tcon and tid instead of conn and cnum
- make use of talloc destructors
metze
(This used to be commit 8308da6ce4a95f8c10e22949ef00e9e64f2dbb85)
Diffstat (limited to 'source4/smb_server/smb_server.c')
| -rw-r--r-- | source4/smb_server/smb_server.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0b2fe668af..ddbaf43cc9 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -39,7 +39,7 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve req_setup_reply(req, 8, 0); SCVAL(req->out.hdr,HDR_COM,SMBlockingX); - SSVAL(req->out.hdr,HDR_TID,tcon->cnum); + SSVAL(req->out.hdr,HDR_TID,tcon->tid); SSVAL(req->out.hdr,HDR_PID,0xFFFF); SSVAL(req->out.hdr,HDR_UID,0); SSVAL(req->out.hdr,HDR_MID,0xFFFF); @@ -484,7 +484,7 @@ static void switch_message(int type, struct smbsrv_request *req) flags = smb_messages[type].flags; - req->tcon = conn_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); + req->tcon = smbsrv_tcon_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); if (req->session == NULL) { /* setup the user context for this request if it @@ -792,8 +792,6 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) DEBUG(5,("smbsrv_close: %s\n",reason)); - conn_close_all(smb_conn); - talloc_free(smb_conn); return; @@ -846,7 +844,7 @@ void smbsrv_accept(struct server_connection *conn) srv_init_signing(smb_conn); - conn_init(smb_conn); + smbsrv_tcon_init(smb_conn); smb_conn->connection = conn; |