summaryrefslogtreecommitdiff
path: root/source3/smbd/connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd/connection.c')
-rw-r--r--source3/smbd/connection.c7
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;
}