auth: Remove early return from make_user_info_dc_pac()
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Mon, 7 Nov 2022 06:37:12 +0000 (19:37 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 8 Feb 2023 00:03:39 +0000 (00:03 +0000)
'rg' is never NULL, so this codepath is never taken. But if it were, we
would return early and entirely neglect filling in the UPN_DNS_INFO from
the 'pac_upn_dns_info' parameter. So remove the early return.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
auth/auth_sam_reply.c

index 8a68f045547f23d763b9f493cc1203bd41ce646e..b088ebb9a434da9655d003b247e7cfc004efc1c2 100644 (file)
@@ -605,12 +605,7 @@ NTSTATUS make_user_info_dc_pac(TALLOC_CTX *mem_ctx,
                rg = &pac_logon_info->resource_groups;
        }
 
-       if (rg == NULL) {
-               *_user_info_dc = user_info_dc;
-               return NT_STATUS_OK;
-       }
-
-       if (rg->groups.count > 0) {
+       if (rg != NULL && rg->groups.count > 0) {
                /* The IDL layer would be a better place to check this, but to
                 * guard the integer addition below, we double-check */
                if (rg->groups.count > 65535) {