Ignore:
Timestamp:
Apr 10, 2007, 5:27:38 AM (14 years ago)
Author:
Paul Smedley
Message:

Updated source to 3.0.25rc1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/samba/source/librpc/ndr/ndr_sec_helper.c

    r1 r26  
    131131        uint8_t v;
    132132        NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
    133         *r = v;
     133        *r = (enum security_ace_type)v;
    134134        return NT_STATUS_OK;
    135135}
     
    560560        uint16_t v;
    561561        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
    562         *r = v;
     562        *r = (enum security_acl_revision)v;
    563563        return NT_STATUS_OK;
    564564}
     
    604604                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
    605605                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aces));
    606                 if (r->num_aces < 0 || r->num_aces > 1000) {
     606                if (r->num_aces > 1000) { /* num_aces is unsigned */
    607607                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
    608608                }
     
    658658        uint8_t v;
    659659        NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
    660         *r = v;
     660        *r = (enum security_descriptor_revision)v;
    661661        return NT_STATUS_OK;
    662662}
Note: See TracChangeset for help on using the changeset viewer.