rerun 'make samba3-idl'

[samba.git] / source3 / librpc / gen_ndr / ndr_notify.c

diff --git a/source3/librpc/gen_ndr/ndr_notify.c b/source3/librpc/gen_ndr/ndr_notify.c
index dfa72d8004068610a73b5537520c7d832c2ed2b8..7e561de6a587efef072b6f116e7693f70eccf759 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_notify.c
+++ b/source3/librpc/gen_ndr/ndr_notify.c
@@ -3,7 +3,6 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_notify.h"
 
-#include "librpc/gen_ndr/ndr_security.h"
 _PUBLIC_ enum ndr_err_code ndr_push_notify_entry(struct ndr_push *ndr, int ndr_flags, const struct notify_entry *r)
 {
        if (ndr_flags & NDR_SCALARS) {
@@ -11,6 +10,8 @@ _PUBLIC_ enum ndr_err_code ndr_push_notify_entry(struct ndr_push *ndr, int ndr_f
                NDR_CHECK(ndr_push_server_id(ndr, NDR_SCALARS, &r->server));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->filter));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->subdir_filter));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->dir_fd));
+               NDR_CHECK(ndr_push_file_id(ndr, NDR_SCALARS, &r->dir_id));
                {
                        uint32_t _flags_save_string = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
@@ -22,6 +23,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_notify_entry(struct ndr_push *ndr, int ndr_f
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_server_id(ndr, NDR_BUFFERS, &r->server));
+               NDR_CHECK(ndr_push_file_id(ndr, NDR_BUFFERS, &r->dir_id));
        }
        return NDR_ERR_SUCCESS;
 }
@@ -33,6 +35,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_notify_entry(struct ndr_pull *ndr, int ndr_f
                NDR_CHECK(ndr_pull_server_id(ndr, NDR_SCALARS, &r->server));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->filter));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->subdir_filter));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->dir_fd));
+               NDR_CHECK(ndr_pull_file_id(ndr, NDR_SCALARS, &r->dir_id));
                {
                        uint32_t _flags_save_string = ndr->flags;
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_UTF8|LIBNDR_FLAG_STR_NULLTERM);
@@ -44,6 +48,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_notify_entry(struct ndr_pull *ndr, int ndr_f
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_pull_server_id(ndr, NDR_BUFFERS, &r->server));
+               NDR_CHECK(ndr_pull_file_id(ndr, NDR_BUFFERS, &r->dir_id));
        }
        return NDR_ERR_SUCCESS;
 }
@@ -55,6 +60,8 @@ _PUBLIC_ void ndr_print_notify_entry(struct ndr_print *ndr, const char *name, co
        ndr_print_server_id(ndr, "server", &r->server);
        ndr_print_uint32(ndr, "filter", r->filter);
        ndr_print_uint32(ndr, "subdir_filter", r->subdir_filter);
+       ndr_print_uint32(ndr, "dir_fd", r->dir_fd);
+       ndr_print_file_id(ndr, "dir_id", &r->dir_id);
        ndr_print_string(ndr, "path", r->path);
        ndr_print_uint32(ndr, "path_len", r->path_len);
        ndr_print_pointer(ndr, "private_data", r->private_data);
@@ -83,6 +90,7 @@ static enum ndr_err_code ndr_push_notify_depth(struct ndr_push *ndr, int ndr_fla
 
 static enum ndr_err_code ndr_pull_notify_depth(struct ndr_pull *ndr, int ndr_flags, struct notify_depth *r)
 {
+       uint32_t size_entries_0 = 0;
        uint32_t cntr_entries_0;
        TALLOC_CTX *_mem_save_entries_0;
        if (ndr_flags & NDR_SCALARS) {
@@ -90,18 +98,20 @@ static enum ndr_err_code ndr_pull_notify_depth(struct ndr_pull *ndr, int ndr_fla
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_mask));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_mask_subdir));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_entries));
-               NDR_PULL_ALLOC_N(ndr, r->entries, r->num_entries);
+               size_entries_0 = r->num_entries;
+               NDR_PULL_ALLOC_N(ndr, r->entries, size_entries_0);
                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
-               for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
+               for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_SCALARS, &r->entries[cntr_entries_0]));
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_entries_0, 0);
        }
        if (ndr_flags & NDR_BUFFERS) {
+               size_entries_0 = r->num_entries;
                _mem_save_entries_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->entries, 0);
-               for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
+               for (cntr_entries_0 = 0; cntr_entries_0 < size_entries_0; cntr_entries_0++) {
                        NDR_CHECK(ndr_pull_notify_entry(ndr, NDR_BUFFERS, &r->entries[cntr_entries_0]));
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_entries_0, 0);
@@ -150,23 +160,26 @@ _PUBLIC_ enum ndr_err_code ndr_push_notify_array(struct ndr_push *ndr, int ndr_f
 
 _PUBLIC_ enum ndr_err_code ndr_pull_notify_array(struct ndr_pull *ndr, int ndr_flags, struct notify_array *r)
 {
+       uint32_t size_depth_0 = 0;
        uint32_t cntr_depth_0;
        TALLOC_CTX *_mem_save_depth_0;
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 8));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_depths));
-               NDR_PULL_ALLOC_N(ndr, r->depth, r->num_depths);
+               size_depth_0 = r->num_depths;
+               NDR_PULL_ALLOC_N(ndr, r->depth, size_depth_0);
                _mem_save_depth_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->depth, 0);
-               for (cntr_depth_0 = 0; cntr_depth_0 < r->num_depths; cntr_depth_0++) {
+               for (cntr_depth_0 = 0; cntr_depth_0 < size_depth_0; cntr_depth_0++) {
                        NDR_CHECK(ndr_pull_notify_depth(ndr, NDR_SCALARS, &r->depth[cntr_depth_0]));
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_depth_0, 0);
        }
        if (ndr_flags & NDR_BUFFERS) {
+               size_depth_0 = r->num_depths;
                _mem_save_depth_0 = NDR_PULL_GET_MEM_CTX(ndr);
                NDR_PULL_SET_MEM_CTX(ndr, r->depth, 0);
-               for (cntr_depth_0 = 0; cntr_depth_0 < r->num_depths; cntr_depth_0++) {
+               for (cntr_depth_0 = 0; cntr_depth_0 < size_depth_0; cntr_depth_0++) {
                        NDR_CHECK(ndr_pull_notify_depth(ndr, NDR_BUFFERS, &r->depth[cntr_depth_0]));
                }
                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_depth_0, 0);