From: Ralph Boehme Date: Tue, 21 Jan 2020 11:05:59 +0000 (+0100) Subject: smbd: simplify uid_entry_in_group() X-Git-Tag: ldb-2.2.0~241 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c14a95dc1ac00d49c747eea39db7cff32e59cc86;p=thirdparty%2Fsamba.git smbd: simplify uid_entry_in_group() conn->session_info is always valid since 1fa05e5c76e718142326915f8671299217a093df and preceeding commits. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat May 30 02:40:22 UTC 2020 on sn-devel-184 --- diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index df2b3b57f2a..db2d36a89a1 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1263,26 +1263,18 @@ static bool uid_entry_in_group(connection_struct *conn, canon_ace *uid_ace, cano if (dom_sid_equal(&group_ace->trustee, &global_sid_World)) return True; - /* - * if we have session info in conn, we already have the (SID - * based) NT token and don't need to do the complex - * user_in_group_sid() call - */ - if (conn->session_info) { - security_token = conn->session_info->security_token; - /* security_token should not be NULL */ - SMB_ASSERT(security_token); - is_sid = security_token_is_sid(security_token, - &uid_ace->trustee); - if (is_sid) { - has_sid = security_token_has_sid(security_token, - &group_ace->trustee); - - if (has_sid) { - return true; - } + security_token = conn->session_info->security_token; + /* security_token should not be NULL */ + SMB_ASSERT(security_token); + is_sid = security_token_is_sid(security_token, + &uid_ace->trustee); + if (is_sid) { + has_sid = security_token_has_sid(security_token, + &group_ace->trustee); + + if (has_sid) { + return true; } - } /*