Attachment #629608 for bug #692800




                                  union security_ace_object_type *r)
{
    uint32_t level;
    NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
    NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
    if (ndr_flags & NDR_SCALARS) {
        NDR_CHECK(ndr_pull_union_align(ndr, 4));

                                            union security_ace_object_inherited_type *r)
{
    uint32_t level;
    NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
    NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
    if (ndr_flags & NDR_SCALARS) {
        NDR_CHECK(ndr_pull_union_align(ndr, 4));

                                 union security_ace_object_ctr *r)
{
    uint32_t level;
    NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
    NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
    if (ndr_flags & NDR_SCALARS) {
        NDR_CHECK(ndr_pull_union_align(ndr, 4));

Return to bug 692800

Lines 105-111 ndr_pull_security_ace_object_type(struct Link Here

(-)a/src/providers/ad/ad_gpo_ndr.c (-3 / +3 lines)
105	union security_ace_object_type *r)	105	union security_ace_object_type *r)
106	{	106	{
107	uint32_t level;	107	uint32_t level;
108	level = ndr_pull_get_switch_value(ndr, r);	108	NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
109	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);	109	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
110	if (ndr_flags & NDR_SCALARS) {	110	if (ndr_flags & NDR_SCALARS) {
111	NDR_CHECK(ndr_pull_union_align(ndr, 4));	111	NDR_CHECK(ndr_pull_union_align(ndr, 4));
Lines 135-141 ndr_pull_security_ace_object_inherited_t Link Here
135	union security_ace_object_inherited_type *r)	135	union security_ace_object_inherited_type *r)
136	{	136	{
137	uint32_t level;	137	uint32_t level;
138	level = ndr_pull_get_switch_value(ndr, r);	138	NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
139	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);	139	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
140	if (ndr_flags & NDR_SCALARS) {	140	if (ndr_flags & NDR_SCALARS) {
141	NDR_CHECK(ndr_pull_union_align(ndr, 4));	141	NDR_CHECK(ndr_pull_union_align(ndr, 4));
Lines 198-204 ndr_pull_security_ace_object_ctr(struct Link Here
198	union security_ace_object_ctr *r)	198	union security_ace_object_ctr *r)
199	{	199	{
200	uint32_t level;	200	uint32_t level;
201	level = ndr_pull_get_switch_value(ndr, r);	201	NDR_CHECK(ndr_pull_steal_switch_value(ndr, r, &level));
202	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);	202	NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
203	if (ndr_flags & NDR_SCALARS) {	203	if (ndr_flags & NDR_SCALARS) {
204	NDR_CHECK(ndr_pull_union_align(ndr, 4));	204	NDR_CHECK(ndr_pull_union_align(ndr, 4));