s3: re-run make full_idl.

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

diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index 5453d0c12b3960bfedcd057132b1d2273411e08e..711e034690d198ca84fff185684ee3277eb97c4d 100644 (file)
--- a/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
@@ -630,20 +630,24 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_descriptor(struct ndr_push *ndr, in
                }
                if (ndr_flags & NDR_BUFFERS) {
                        if (r->owner_sid) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->owner_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->owner_sid));
                                NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->owner_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->owner_sid));
                        }
                        if (r->group_sid) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->group_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->group_sid));
                                NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->group_sid));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->group_sid));
                        }
                        if (r->sacl) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->sacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->sacl));
                                NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->sacl));
                        }
                        if (r->dacl) {
-                               NDR_CHECK(ndr_push_relative_ptr2(ndr, r->dacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dacl));
                                NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl));
+                               NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->dacl));
                        }
                }
                ndr->flags = _flags_save_STRUCT;
@@ -707,6 +711,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, in
                                NDR_PULL_SET_MEM_CTX(ndr, r->owner_sid, 0);
                                NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, r->owner_sid));
                                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_owner_sid_0, 0);
+                               if (ndr->offset > ndr->relative_highest_offset) {
+                                       ndr->relative_highest_offset = ndr->offset;
+                               }
                                ndr->offset = _relative_save_offset;
                        }
                        if (r->group_sid) {
@@ -717,6 +724,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, in
                                NDR_PULL_SET_MEM_CTX(ndr, r->group_sid, 0);
                                NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, r->group_sid));
                                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_group_sid_0, 0);
+                               if (ndr->offset > ndr->relative_highest_offset) {
+                                       ndr->relative_highest_offset = ndr->offset;
+                               }
                                ndr->offset = _relative_save_offset;
                        }
                        if (r->sacl) {
@@ -727,6 +737,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, in
                                NDR_PULL_SET_MEM_CTX(ndr, r->sacl, 0);
                                NDR_CHECK(ndr_pull_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->sacl));
                                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sacl_0, 0);
+                               if (ndr->offset > ndr->relative_highest_offset) {
+                                       ndr->relative_highest_offset = ndr->offset;
+                               }
                                ndr->offset = _relative_save_offset;
                        }
                        if (r->dacl) {
@@ -737,6 +750,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_descriptor(struct ndr_pull *ndr, in
                                NDR_PULL_SET_MEM_CTX(ndr, r->dacl, 0);
                                NDR_CHECK(ndr_pull_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->dacl));
                                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_dacl_0, 0);
+                               if (ndr->offset > ndr->relative_highest_offset) {
+                                       ndr->relative_highest_offset = ndr->offset;
+                               }
                                ndr->offset = _relative_save_offset;
                        }
                }
@@ -865,7 +881,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_token(struct ndr_push *ndr, int ndr
                        NDR_CHECK(ndr_push_unique_ptr(ndr, r->sids[cntr_sids_0]));
                }
                NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, r->privilege_mask));
-               NDR_CHECK(ndr_push_unique_ptr(ndr, r->default_dacl));
                NDR_CHECK(ndr_push_trailer_align(ndr, 5));
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -880,9 +895,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_token(struct ndr_push *ndr, int ndr
                                NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->sids[cntr_sids_0]));
                        }
                }
-               if (r->default_dacl) {
-                       NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->default_dacl));
-               }
        }
        return NDR_ERR_SUCCESS;
 }
@@ -897,8 +909,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
        uint32_t cntr_sids_0;
        TALLOC_CTX *_mem_save_sids_0;
        TALLOC_CTX *_mem_save_sids_1;
-       uint32_t _ptr_default_dacl;
-       TALLOC_CTX *_mem_save_default_dacl_0;
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_user_sid));
@@ -928,12 +938,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sids_0, 0);
                NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->privilege_mask));
-               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_dacl));
-               if (_ptr_default_dacl) {
-                       NDR_PULL_ALLOC(ndr, r->default_dacl);
-               } else {
-                       r->default_dacl = NULL;
-               }
                if (r->sids) {
                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->sids, r->num_sids));
                }
@@ -963,12 +967,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
                        }
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sids_0, 0);
-               if (r->default_dacl) {
-                       _mem_save_default_dacl_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                       NDR_PULL_SET_MEM_CTX(ndr, r->default_dacl, 0);
-                       NDR_CHECK(ndr_pull_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->default_dacl));
-                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_default_dacl_0, 0);
-               }
        }
        return NDR_ERR_SUCCESS;
 }
@@ -1007,12 +1005,6 @@ _PUBLIC_ void ndr_print_security_token(struct ndr_print *ndr, const char *name,
        }
        ndr->depth--;
        ndr_print_udlong(ndr, "privilege_mask", r->privilege_mask);
-       ndr_print_ptr(ndr, "default_dacl", r->default_dacl);
-       ndr->depth++;
-       if (r->default_dacl) {
-               ndr_print_security_acl(ndr, "default_dacl", r->default_dacl);
-       }
-       ndr->depth--;
        ndr->depth--;
 }