summaryrefslogtreecommitdiff
path: root/source3/smbd/uid.c
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2018-07-09 01:40:58 +0200
committerJeremy Allison <jra@samba.org>2018-07-10 00:12:19 +0200
commit3796bb0048a276259e30e44f7e0e071c1516727a (patch)
treeebb328752166c81a2fe65183d3f354148bd24d0f /source3/smbd/uid.c
parent3e5e775321e6c432d92d459219ecebbb9713890d (diff)
downloadsamba-3796bb0048a276259e30e44f7e0e071c1516727a.tar.gz
Revert "s3/service: convert lp_force_group() to const"
This reverts commit c53646bccd87ef3b3133d3f7526ef85591909528. As mentioned by Andrew, we shouldn't break environments where "force group" has been configured to use substituted variables. Signed-off-by: David Disseldorp <ddiss@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Jul 10 00:12:19 CEST 2018 on sn-devel-144
Diffstat (limited to 'source3/smbd/uid.c')
-rw-r--r--source3/smbd/uid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index b6a754b8cfd..9d5321cf4cc 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -335,8 +335,7 @@ static bool change_to_user_internal(connection_struct *conn,
* See if we should force group for this service. If so this overrides
* any group set in the force user code.
*/
- group_c = *lp_force_group(snum);
- if (group_c != '\0') {
+ if((group_c = *lp_force_group(talloc_tos(), snum))) {
SMB_ASSERT(conn->force_group_gid != (gid_t)-1);