diff options
| author | David Disseldorp <ddiss@samba.org> | 2018-07-09 01:40:58 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2018-07-10 00:12:19 +0200 |
| commit | 3796bb0048a276259e30e44f7e0e071c1516727a (patch) | |
| tree | ebb328752166c81a2fe65183d3f354148bd24d0f /source3 | |
| parent | 3e5e775321e6c432d92d459219ecebbb9713890d (diff) | |
| download | samba-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')
| -rw-r--r-- | source3/smbd/service.c | 19 | ||||
| -rw-r--r-- | source3/smbd/uid.c | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index df72172d9b0..2e4a1136254 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -243,18 +243,23 @@ static NTSTATUS find_forced_group(bool force_user, TALLOC_CTX *frame = talloc_stackframe(); struct dom_sid group_sid; enum lsa_SidType type; - const char *force_group; char *groupname; bool user_must_be_member = False; gid_t gid; - force_group = lp_force_group(snum); - if (force_group[0] == '+') { - user_must_be_member = true; - force_group += 1; + groupname = lp_force_group(talloc_tos(), snum); + if (groupname == NULL) { + DEBUG(1, ("talloc_strdup failed\n")); + result = NT_STATUS_NO_MEMORY; + goto done; + } + + if (groupname[0] == '+') { + user_must_be_member = True; + groupname += 1; } - groupname = talloc_string_sub(talloc_tos(), force_group, + groupname = talloc_string_sub(talloc_tos(), groupname, "%S", lp_const_servicename(snum)); if (groupname == NULL) { DEBUG(1, ("talloc_string_sub failed\n")); @@ -422,7 +427,7 @@ NTSTATUS set_conn_force_user_group(connection_struct *conn, int snum) * any groupid stored for the connecting user. */ - if (*lp_force_group(snum)) { + if (*lp_force_group(talloc_tos(), snum)) { status = find_forced_group( conn->force_user, snum, conn->session_info->unix_info->unix_name, 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); |