diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-08 05:39:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:34 -0500 |
| commit | 893c62d38388b20c52cf3c45069d836c46f42bd3 (patch) | |
| tree | b11304934190db80fd453089a88ff18ec4728bba /source4/smb_server/conn.c | |
| parent | 8293df91bcec574fb4a2b290cc11dd83353264ae (diff) | |
| download | samba-893c62d38388b20c52cf3c45069d836c46f42bd3.tar.gz samba-893c62d38388b20c52cf3c45069d836c46f42bd3.tar.bz2 samba-893c62d38388b20c52cf3c45069d836c46f42bd3.zip | |
r2249: got rid of some more mem_ctx elements in structures
(This used to be commit 21ef338cbbe96acc8594ffc550ef60c6a40fb951)
Diffstat (limited to 'source4/smb_server/conn.c')
| -rw-r--r-- | source4/smb_server/conn.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c index 197d925f34..1872d9b9d4 100644 --- a/source4/smb_server/conn.c +++ b/source4/smb_server/conn.c @@ -78,7 +78,6 @@ thinking the server is still available. ****************************************************************************/ struct smbsrv_tcon *conn_new(struct smbsrv_connection *smb_conn) { - TALLOC_CTX *mem_ctx; struct smbsrv_tcon *tcon; int i; @@ -89,14 +88,11 @@ struct smbsrv_tcon *conn_new(struct smbsrv_connection *smb_conn) return NULL; } - mem_ctx = talloc_init("smbsrv_tcon[%d]", i); - - tcon = talloc_p(mem_ctx, struct smbsrv_tcon); + tcon = talloc_p(smb_conn, struct smbsrv_tcon); if (!tcon) return NULL; ZERO_STRUCTP(tcon); - tcon->mem_ctx = mem_ctx; tcon->cnum = i; tcon->smb_conn = smb_conn; @@ -152,6 +148,6 @@ void conn_free(struct smbsrv_connection *smb_conn, struct smbsrv_tcon *tcon) bitmap_clear(smb_conn->tree.bmap, tcon->cnum); smb_conn->tree.num_open--; - talloc_destroy(tcon->mem_ctx); + talloc_destroy(tcon); } |