diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_default.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_dfs_samba4.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_expand_msdfs.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_fileid.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_recycle.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 8485495bb5..f8c5b75977 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -161,7 +161,7 @@ static uint32_t vfswrap_fs_capabilities(struct vfs_handle_struct *handle, "resolution of %s " "available on share %s, directory %s\n", *p_ts_res == TIMESTAMP_SET_MSEC ? "msec" : "sec", - lp_servicename(conn->params->service), + lp_servicename(talloc_tos(), conn->params->service), conn->connectpath )); } TALLOC_FREE(smb_fname_cpath); diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c index 200c744889..e77a993331 100644 --- a/source3/modules/vfs_dfs_samba4.c +++ b/source3/modules/vfs_dfs_samba4.c @@ -96,7 +96,7 @@ static int dfs_samba4_connect(struct vfs_handle_struct *handle, static void dfs_samba4_disconnect(struct vfs_handle_struct *handle) { DEBUG(10,("dfs_samba4_disconnect() connect to service[%s].\n", - lp_servicename(SNUM(handle->conn)))); + lp_servicename(talloc_tos(), SNUM(handle->conn)))); SMB_VFS_NEXT_DISCONNECT(handle); } diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c index d6e25776f1..eaf96e0ae0 100644 --- a/source3/modules/vfs_expand_msdfs.c +++ b/source3/modules/vfs_expand_msdfs.c @@ -156,7 +156,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx, } targethost = talloc_sub_advanced(ctx, - lp_servicename(SNUM(conn)), + lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c index 6237513f23..25048e767d 100644 --- a/source3/modules/vfs_fileid.c +++ b/source3/modules/vfs_fileid.c @@ -229,7 +229,7 @@ static int fileid_connect(struct vfs_handle_struct *handle, static void fileid_disconnect(struct vfs_handle_struct *handle) { DEBUG(10,("fileid_disconnect() connect to service[%s].\n", - lp_servicename(SNUM(handle->conn)))); + lp_servicename(talloc_tos(), SNUM(handle->conn)))); SMB_VFS_NEXT_DISCONNECT(handle); } diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index de4f7996bf..b93df5090d 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -397,7 +397,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) return NULL; } result = talloc_sub_advanced(ctx, - lp_servicename(SNUM(conn)), + lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, @@ -637,7 +637,7 @@ static void smb_full_audit_disconnect(vfs_handle_struct *handle) SMB_VFS_NEXT_DISCONNECT(handle); do_log(SMB_VFS_OP_DISCONNECT, True, handle, - "%s", lp_servicename(SNUM(handle->conn))); + "%s", lp_servicename(talloc_tos(), SNUM(handle->conn))); /* The bitmaps will be disconnected when the private data is deleted. */ diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index 37d930f793..3e6825041e 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -448,7 +448,7 @@ static int recycle_unlink(vfs_handle_struct *handle, NTSTATUS status; int rc = -1; - repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)), + repository = talloc_sub_advanced(NULL, lp_servicename(talloc_tos(), SNUM(conn)), conn->session_info->unix_info->unix_name, conn->connectpath, conn->session_info->unix_token->gid, |