File 0028-ad-replace-ARRAY_SIZE-with-N_ELEMENTS.patch of Package sssd

Overview Repositories Revisions Requests Users Attributes Meta

File 0028-ad-replace-ARRAY_SIZE-with-N_ELEMENTS.patch of Package sssd

From 9ae3fe2230b627b4817ee3ceb0c4c96ebc3ccdf5 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 15 Feb 2019 09:18:23 +0100
Subject: [PATCH] ad: replace ARRAY_SIZE with N_ELEMENTS

ARRAY_SIZE is taken from the Samba header file memory.h which is not
available as a public header in newer Samba versions anymore. This patch
replaces it with an internal macro.

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
(cherry picked from commit e1ff063ffa4ad459bd0c8a9da56abf8379401dbe)
---
 src/providers/ad/ad_gpo_ndr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c
index 884ab763a..0a8ebaee8 100644
--- a/src/providers/ad/ad_gpo_ndr.c
+++ b/src/providers/ad/ad_gpo_ndr.c
@@ -258,7 +258,7 @@ ndr_pull_dom_sid(struct ndr_pull *ndr,
         NDR_CHECK(ndr_pull_align(ndr, 4));
         NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->sid_rev_num));
         NDR_CHECK(ndr_pull_int8(ndr, NDR_SCALARS, &r->num_auths));
-        if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
+        if (r->num_auths < 0 || r->num_auths > N_ELEMENTS(r->sub_auths)) {
             return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
         }
         NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
-- 
2.22.0

Places

File 0028-ad-replace-ARRAY_SIZE-with-N_ELEMENTS.patch of Package sssd

Places