Ignore:
Timestamp:
Nov 29, 2012, 2:06:31 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:
trunk/server
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/libcli/netlogon/ndr_netlogon.c

    r745 r752  
    5454                        struct ndr_push *_ndr_sid;
    5555                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
     56                        ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
    5657                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
    5758                        NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_pad));
    … …  
    99100                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
    100101                        struct ndr_pull *_ndr_sid;
     102                        ndr->flags &= ~LIBNDR_FLAG_NOALIGN;
    101103                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
    102104                        NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
Note: See TracChangeset for help on using the changeset viewer.