From fb18b37553412c0d8baf0dbb65cc508dbaf989a5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 19 Feb 2020 13:20:14 -0800 Subject: [PATCH] s3: VFS: full_audit. Use system session_info if called from a temporary share definition. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14283 Signed-off-by: Jeremy Allison --- source3/modules/vfs_full_audit.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 8b04e55444e..14d4e1fbe6d 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -478,6 +478,7 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) { char *prefix = NULL; char *result; + const struct auth_session_info *session_info = conn->session_info; prefix = talloc_strdup(ctx, lp_parm_const_string(SNUM(conn), "full_audit", @@ -485,13 +486,24 @@ static char *audit_prefix(TALLOC_CTX *ctx, connection_struct *conn) if (!prefix) { return NULL; } + + if (session_info == NULL) { + /* + * conn->session_info can be NULL if we're + * called from a temporary conn created in + * the MSDFS and other code. It's been created + * by root so just use the system session. + */ + session_info = get_session_info_system(); + } + result = talloc_sub_full(ctx, lp_servicename(talloc_tos(), SNUM(conn)), - conn->session_info->unix_info->unix_name, + session_info->unix_info->unix_name, conn->connectpath, - conn->session_info->unix_token->gid, - conn->session_info->unix_info->sanitized_username, - conn->session_info->info->domain_name, + session_info->unix_token->gid, + session_info->unix_info->sanitized_username, + session_info->info->domain_name, prefix); TALLOC_FREE(prefix); return result; -- 2.25.0.265.gbab2e86ba0-goog