diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-07-18 15:07:23 +0930 |
| commit | fe72740e8221575921c22030d6d4fcb19201b03b (patch) | |
| tree | 0b1bb254e23d6541eede8f2ff4494af477fd5566 /source3/smbd/connection.c | |
| parent | c809eec53fb1d2a36909e4934dff349f91e3359e (diff) | |
| download | samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.gz samba-fe72740e8221575921c22030d6d4fcb19201b03b.tar.bz2 samba-fe72740e8221575921c22030d6d4fcb19201b03b.zip | |
loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *.
They use talloc_tos() internally: hoist that up to the callers, some
of whom don't want to us talloc_tos().
A simple patch, but hits a lot of files.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'source3/smbd/connection.c')
| -rw-r--r-- | source3/smbd/connection.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c index 846a173ad7..d334e8bdc1 100644 --- a/source3/smbd/connection.c +++ b/source3/smbd/connection.c @@ -136,7 +136,8 @@ bool connections_snum_used(struct smbd_server_connection *unused, int snum) { int active; - active = count_current_connections(lp_servicename(snum), true); + active = count_current_connections(lp_servicename(talloc_tos(), snum), + true); if (active > 0) { return true; } @@ -173,12 +174,12 @@ bool claim_connection(connection_struct *conn, const char *name) crec.cnum = conn->cnum; crec.uid = conn->session_info->unix_token->uid; crec.gid = conn->session_info->unix_token->gid; - strlcpy(crec.servicename, lp_servicename(SNUM(conn)), + strlcpy(crec.servicename, lp_servicename(rec, SNUM(conn)), sizeof(crec.servicename)); crec.start = time(NULL); raddr = tsocket_address_inet_addr_string(conn->sconn->remote_address, - talloc_tos()); + rec); if (raddr == NULL) { return false; } |