>From 0ebfbf18ba214709e3690fd9c43eb099664cc6ae Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 2 Oct 2014 18:30:56 +0200 Subject: [PATCH 1/2] GPO: Use argument ndg_flags instead of constant Some internal gpo functions [1] were called just once and with constant NDR_SCALARS as 2nd argument(ndr_flags), but 2nd argument was not used in these functions[1]. They used constant NDR_SCALARS. [1] ndr_pull_security_ace_flags, ndr_pull_security_ace_type, ndr_pull_security_ace_object_flags, ndr_pull_security_acl_revision, ndr_pull_security_descriptor_revision, ndr_pull_security_descriptor_type --- src/providers/ad/ad_gpo_ndr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/providers/ad/ad_gpo_ndr.c b/src/providers/ad/ad_gpo_ndr.c index 0ee28f0972ce9d8e0c651fc2a03b2c0641f7ad58..884ab763a75959fcc1bc2aa0ae4b233061de3539 100644 --- a/src/providers/ad/ad_gpo_ndr.c +++ b/src/providers/ad/ad_gpo_ndr.c @@ -69,7 +69,7 @@ ndr_pull_security_ace_flags(struct ndr_pull *ndr, uint8_t *r) { uint8_t v; - NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_uint8(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } @@ -81,7 +81,7 @@ ndr_pull_security_ace_type(struct ndr_pull *ndr, enum security_ace_type *r) { uint8_t v; - NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_enum_uint8(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } @@ -93,7 +93,7 @@ ndr_pull_security_ace_object_flags(struct ndr_pull *ndr, uint32_t *r) { uint32_t v; - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_uint32(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } @@ -314,7 +314,7 @@ ndr_pull_security_acl_revision(struct ndr_pull *ndr, enum security_acl_revision *r) { uint16_t v; - NDR_CHECK(ndr_pull_enum_uint1632(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_enum_uint1632(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } @@ -369,7 +369,7 @@ ndr_pull_security_descriptor_revision(struct ndr_pull *ndr, enum security_descriptor_revision *r) { uint8_t v; - NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_enum_uint8(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } @@ -382,7 +382,7 @@ ndr_pull_security_descriptor_type(struct ndr_pull *ndr, uint16_t *r) { uint16_t v; - NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v)); + NDR_CHECK(ndr_pull_uint16(ndr, ndr_flags, &v)); *r = v; return NDR_ERR_SUCCESS; } -- 2.1.0