From: David Disseldorp <ddiss@samba.org>
Date: Mon, 25 Jun 2018 00:22:31 +0000 (+0200)
Subject: s3/service: convert lp_force_user() to const
X-Git-Tag: tevent-0.9.37~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c58194e3d296f4e14e7689bdf192c561635ae161;p=thirdparty%2Fsamba.git

s3/service: convert lp_force_user() to const

Avoid set_conn_force_user_group() talloc stackframe leaks in doing so.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/docs-xml/smbdotconf/security/forceuser.xml b/docs-xml/smbdotconf/security/forceuser.xml
index ff5c7a2f3f1..3316afe14ac 100644
--- a/docs-xml/smbdotconf/security/forceuser.xml
+++ b/docs-xml/smbdotconf/security/forceuser.xml
@@ -1,5 +1,6 @@
 <samba:parameter name="force user"
                  type="string"
+                 constant="1"
                  context="S"
                  xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index df72172d9b0..2fa7c608a2b 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(talloc_tos(), snum)) {
+	if (*lp_force_user(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(talloc_tos(), snum), "%S",
+		fuser = talloc_string_sub(conn, lp_force_user(snum), "%S",
 					  lp_const_servicename(snum));
 		if (fuser == NULL) {
 			return NT_STATUS_NO_MEMORY;