From 3e5e775321e6c432d92d459219ecebbb9713890d Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 9 Jul 2018 01:36:11 +0200 Subject: [PATCH] Revert "s3/service: convert lp_force_user() to const" This reverts commit c58194e3d296f4e14e7689bdf192c561635ae161. As mentioned by Andrew, we shouldn't break environments where "force user" has been configured to use substituted variables. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison --- docs-xml/smbdotconf/security/forceuser.xml | 1 - source3/smbd/service.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs-xml/smbdotconf/security/forceuser.xml b/docs-xml/smbdotconf/security/forceuser.xml index 3316afe14ac..ff5c7a2f3f1 100644 --- a/docs-xml/smbdotconf/security/forceuser.xml +++ b/docs-xml/smbdotconf/security/forceuser.xml @@ -1,6 +1,5 @@ diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 2fa7c608a2b..df72172d9b0 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -372,7 +372,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum) { NTSTATUS status; - if (*lp_force_user(snum)) { + if (*lp_force_user(talloc_tos(), snum)) { /* * Replace conn->session_info with a completely faked up one @@ -384,7 +384,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum) struct auth_session_info *forced_serverinfo; bool guest; - fuser = talloc_string_sub(conn, lp_force_user(snum), "%S", + fuser = talloc_string_sub(conn, lp_force_user(talloc_tos(), snum), "%S", lp_const_servicename(snum)); if (fuser == NULL) { return NT_STATUS_NO_MEMORY; -- 2.11.4.GIT