Ignore:
Timestamp:
Nov 29, 2012, 1:59:04 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/source3/librpc/gen_ndr/ndr_dns.c

    r745 r751  
    243243_PUBLIC_ enum ndr_err_code ndr_pull_dns_rdata_data(struct ndr_pull *ndr, int ndr_flags, struct dns_rdata_data *r)
    244244{
     245
    245246        if (ndr_flags & NDR_SCALARS) {
    246247                NDR_CHECK(ndr_pull_align(ndr, 2));
    247248                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->length));
    248                 NDR_PULL_ALLOC_N(ndr, r->data, r->length);
    249                 NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, r->length));
     249                size_data_0 = r->length;
     250                NDR_PULL_ALLOC_N(ndr, r->data, size_data_0);
     251                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->data, size_data_0));
    250252                NDR_CHECK(ndr_pull_trailer_align(ndr, 2));
    251253        }
     
    679681_PUBLIC_ enum ndr_err_code ndr_pull_dns_name_packet(struct ndr_pull *ndr, int ndr_flags, struct dns_name_packet *r)
    680682{
     683
    681684        uint32_t cntr_questions_0;
    682685        TALLOC_CTX *_mem_save_questions_0;
     686
    683687        uint32_t cntr_answers_0;
    684688        TALLOC_CTX *_mem_save_answers_0;
     689
    685690        uint32_t cntr_nsrecs_0;
    686691        TALLOC_CTX *_mem_save_nsrecs_0;
     692
    687693        uint32_t cntr_additional_0;
    688694        TALLOC_CTX *_mem_save_additional_0;
     
    698704                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->nscount));
    699705                        NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->arcount));
    700                         NDR_PULL_ALLOC_N(ndr, r->questions, r->qdcount);
     706                        size_questions_0 = r->qdcount;
     707                        NDR_PULL_ALLOC_N(ndr, r->questions, size_questions_0);
    701708                        _mem_save_questions_0 = NDR_PULL_GET_MEM_CTX(ndr);
    702709                        NDR_PULL_SET_MEM_CTX(ndr, r->questions, 0);
    703                         for (cntr_questions_0 = 0; cntr_questions_0 < r->qdcount; cntr_questions_0++) {
     710                        for (cntr_questions_0 = 0; cntr_questions_0 < ; cntr_questions_0++) {
    704711                                NDR_CHECK(ndr_pull_dns_name_question(ndr, NDR_SCALARS, &r->questions[cntr_questions_0]));
    705712                        }
    706713                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_questions_0, 0);
    707                         NDR_PULL_ALLOC_N(ndr, r->answers, r->ancount);
     714                        size_answers_0 = r->ancount;
     715                        NDR_PULL_ALLOC_N(ndr, r->answers, size_answers_0);
    708716                        _mem_save_answers_0 = NDR_PULL_GET_MEM_CTX(ndr);
    709717                        NDR_PULL_SET_MEM_CTX(ndr, r->answers, 0);
    710                         for (cntr_answers_0 = 0; cntr_answers_0 < r->ancount; cntr_answers_0++) {
     718                        for (cntr_answers_0 = 0; cntr_answers_0 < ; cntr_answers_0++) {
    711719                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_SCALARS, &r->answers[cntr_answers_0]));
    712720                        }
    713721                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_answers_0, 0);
    714                         NDR_PULL_ALLOC_N(ndr, r->nsrecs, r->nscount);
     722                        size_nsrecs_0 = r->nscount;
     723                        NDR_PULL_ALLOC_N(ndr, r->nsrecs, size_nsrecs_0);
    715724                        _mem_save_nsrecs_0 = NDR_PULL_GET_MEM_CTX(ndr);
    716725                        NDR_PULL_SET_MEM_CTX(ndr, r->nsrecs, 0);
    717                         for (cntr_nsrecs_0 = 0; cntr_nsrecs_0 < r->nscount; cntr_nsrecs_0++) {
     726                        for (cntr_nsrecs_0 = 0; cntr_nsrecs_0 < ; cntr_nsrecs_0++) {
    718727                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_SCALARS, &r->nsrecs[cntr_nsrecs_0]));
    719728                        }
    720729                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_nsrecs_0, 0);
    721                         NDR_PULL_ALLOC_N(ndr, r->additional, r->arcount);
     730                        size_additional_0 = r->arcount;
     731                        NDR_PULL_ALLOC_N(ndr, r->additional, size_additional_0);
    722732                        _mem_save_additional_0 = NDR_PULL_GET_MEM_CTX(ndr);
    723733                        NDR_PULL_SET_MEM_CTX(ndr, r->additional, 0);
    724                         for (cntr_additional_0 = 0; cntr_additional_0 < r->arcount; cntr_additional_0++) {
     734                        for (cntr_additional_0 = 0; cntr_additional_0 < ; cntr_additional_0++) {
    725735                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_SCALARS, &r->additional[cntr_additional_0]));
    726736                        }
     
    729739                }
    730740                if (ndr_flags & NDR_BUFFERS) {
     741
    731742                        _mem_save_answers_0 = NDR_PULL_GET_MEM_CTX(ndr);
    732743                        NDR_PULL_SET_MEM_CTX(ndr, r->answers, 0);
    733                         for (cntr_answers_0 = 0; cntr_answers_0 < r->ancount; cntr_answers_0++) {
     744                        for (cntr_answers_0 = 0; cntr_answers_0 < ; cntr_answers_0++) {
    734745                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_BUFFERS, &r->answers[cntr_answers_0]));
    735746                        }
    736747                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_answers_0, 0);
     748
    737749                        _mem_save_nsrecs_0 = NDR_PULL_GET_MEM_CTX(ndr);
    738750                        NDR_PULL_SET_MEM_CTX(ndr, r->nsrecs, 0);
    739                         for (cntr_nsrecs_0 = 0; cntr_nsrecs_0 < r->nscount; cntr_nsrecs_0++) {
     751                        for (cntr_nsrecs_0 = 0; cntr_nsrecs_0 < ; cntr_nsrecs_0++) {
    740752                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_BUFFERS, &r->nsrecs[cntr_nsrecs_0]));
    741753                        }
    742754                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_nsrecs_0, 0);
     755
    743756                        _mem_save_additional_0 = NDR_PULL_GET_MEM_CTX(ndr);
    744757                        NDR_PULL_SET_MEM_CTX(ndr, r->additional, 0);
    745                         for (cntr_additional_0 = 0; cntr_additional_0 < r->arcount; cntr_additional_0++) {
     758                        for (cntr_additional_0 = 0; cntr_additional_0 < ; cntr_additional_0++) {
    746759                                NDR_CHECK(ndr_pull_dns_res_rec(ndr, NDR_BUFFERS, &r->additional[cntr_additional_0]));
    747760                        }
Note: See TracChangeset for help on using the changeset viewer.