s3: re-run make full_idl.

[abartlet/samba.git/.git] / librpc / gen_ndr / ndr_drsblobs.c

diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c
index 4290ce5325143de8f456ac51582d36f547f21096..807d15f267e19b076f3f237583658b24c55f0afa 100644 (file)
--- a/librpc/gen_ndr/ndr_drsblobs.c
+++ b/librpc/gen_ndr/ndr_drsblobs.c
@@ -534,8 +534,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo1(struct ndr_push *ndr, int ndr_fl
                }
                if (ndr_flags & NDR_BUFFERS) {
                        if (r->other_info) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->other_info));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->other_info));
                                NDR_CHECK(ndr_push_repsFromTo1OtherInfo(ndr, NDR_SCALARS, r->other_info));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->other_info));
                        }
                }
                ndr->flags = _flags_save_STRUCT;
@@ -660,8 +661,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i
                        uint32_t _flags_save_string = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
                        if (r->dns_name1) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dns_name1));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name1));
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name1));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dns_name1));
                        }
                        ndr->flags = _flags_save_string;
                }
@@ -669,8 +671,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i
                        uint32_t _flags_save_string = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
                        if (r->dns_name2) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dns_name2));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name2));
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name2));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dns_name2));
                        }
                        ndr->flags = _flags_save_string;
                }
@@ -814,8 +817,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2(struct ndr_push *ndr, int ndr_fl
                }
                if (ndr_flags & NDR_BUFFERS) {
                        if (r->other_info) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->other_info));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->other_info));
                                NDR_CHECK(ndr_push_repsFromTo2OtherInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->other_info));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->other_info));
                        }
                }
                ndr->flags = _flags_save_STRUCT;
@@ -1909,13 +1913,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosString(struct ndr_push
                        uint32_t _flags_save_string = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_REMAINING);
                        if (r->string) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->string));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->string));
                                {
                                        struct ndr_push *_ndr_string;
                                        NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_string, 0, 2 * strlen_m(r->string)));
                                        NDR_CHECK(ndr_push_string(_ndr_string, NDR_SCALARS, r->string));
                                        NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_string, 0, 2 * strlen_m(r->string)));
                                }
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->string));
                        }
                        ndr->flags = _flags_save_string;
                }
@@ -2010,13 +2015,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosKey3(struct ndr_push *n
                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
                        if (r->value) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->value));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value));
                                {
                                        struct ndr_push *_ndr_value;
                                        NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_value, 0, (r->value?r->value->length:0)));
                                        NDR_CHECK(ndr_push_DATA_BLOB(_ndr_value, NDR_SCALARS, *r->value));
                                        NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_value, 0, (r->value?r->value->length:0)));
                                }
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->value));
                        }
                        ndr->flags = _flags_save_DATA_BLOB;
                }
@@ -2239,13 +2245,14 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosKey4(struct ndr_push *n
                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
                        if (r->value) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->value));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value));
                                {
                                        struct ndr_push *_ndr_value;
                                        NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_value, 0, (r->value?r->value->length:0)));
                                        NDR_CHECK(ndr_push_DATA_BLOB(_ndr_value, NDR_SCALARS, *r->value));
                                        NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_value, 0, (r->value?r->value->length:0)));
                                }
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->value));
                        }
                        ndr->flags = _flags_save_DATA_BLOB;
                }
@@ -3125,8 +3132,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_trustCurrentPasswords(struct ndr_push *ndr,
        if (ndr_flags & NDR_BUFFERS) {
                for (cntr_current_0 = 0; cntr_current_0 < r->count; cntr_current_0++) {
                        if (r->current[cntr_current_0]) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->current[cntr_current_0]));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->current[cntr_current_0]));
                                NDR_CHECK(ndr_push_AuthenticationInformation(ndr, NDR_SCALARS, r->current[cntr_current_0]));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->current[cntr_current_0]));
                        }
                }
        }