Ignore:
Timestamp:
May 24, 2009, 7:45:16 AM (17 years ago)
Author:
Herwig Bauernfeind
Message:

Update Samba 3.3 branch to 3.3.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/samba-3.3.x/source/librpc/gen_ndr/ndr_nbt.c

    r206 r222  
    15321532        if (ndr_flags & NDR_SCALARS) {
    15331533                NDR_CHECK(ndr_push_align(ndr, 4));
    1534                 NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sa_family));
     1534                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->s_family));
    15351535                {
    15361536                        uint32_t _flags_save_ipv4address = ndr->flags;
     
    15551555        if (ndr_flags & NDR_SCALARS) {
    15561556                NDR_CHECK(ndr_pull_align(ndr, 4));
    1557                 NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sa_family));
     1557                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->s_family));
    15581558                {
    15591559                        uint32_t _flags_save_ipv4address = ndr->flags;
     
    15781578        ndr_print_struct(ndr, name, "nbt_sockaddr");
    15791579        ndr->depth++;
    1580         ndr_print_uint32(ndr, "sa_family", r->sa_family);
     1580        ndr_print_uint32(ndr, "s_family);
    15811581        ndr_print_ipv4address(ndr, "pdc_ip", r->pdc_ip);
    15821582        ndr_print_DATA_BLOB(ndr, "remaining", r->remaining);
Note: See TracChangeset for help on using the changeset viewer.