s3: re-run make samba3-idl.

Guenther

diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index 6b084d22171c9cb2870fbd92a1587b9af653296f..b9cf39dea0a2d4610d44e532a1c377e2b143036c 100644 (file)
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -902,7 +902,7 @@ NTSTATUS rpccli_eventlog_WriteClusterEvents(struct rpc_pipe_client *cli,
        return r.out.result;
 }
 
-NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
+NTSTATUS rpccli_eventlog_GetLogInformation(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           uint32_t level /* [in]  */,
@@ -910,7 +910,7 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
                                           uint32_t buf_size /* [in] [range(0,1024)] */,
                                           uint32_t *bytes_needed /* [out] [ref] */)
 {
-       struct eventlog_GetLogIntormation r;
+       struct eventlog_GetLogInformation r;
        NTSTATUS status;
 
        /* In parameters */
@@ -919,13 +919,13 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
        r.in.buf_size = buf_size;
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_IN_DEBUG(eventlog_GetLogIntormation, &r);
+               NDR_PRINT_IN_DEBUG(eventlog_GetLogInformation, &r);
        }
 
        status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_eventlog,
-                               NDR_EVENTLOG_GETLOGINTORMATION,
+                               NDR_EVENTLOG_GETLOGINFORMATION,
                                &r);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -933,7 +933,7 @@ NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
        }
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_OUT_DEBUG(eventlog_GetLogIntormation, &r);
+               NDR_PRINT_OUT_DEBUG(eventlog_GetLogInformation, &r);
        }
 
        if (NT_STATUS_IS_ERR(status)) {

diff --git a/librpc/gen_ndr/cli_eventlog.h b/librpc/gen_ndr/cli_eventlog.h
index ae5544daf3aaeae7c622ed7e37de3efcee4775fc..d905676041afd94573f7b6da74e0ef151c9d4cc8 100644 (file)
--- a/librpc/gen_ndr/cli_eventlog.h
+++ b/librpc/gen_ndr/cli_eventlog.h
@@ -93,7 +93,7 @@ NTSTATUS rpccli_eventlog_DeregisterClusterSvc(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx);
 NTSTATUS rpccli_eventlog_WriteClusterEvents(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx);
-NTSTATUS rpccli_eventlog_GetLogIntormation(struct rpc_pipe_client *cli,
+NTSTATUS rpccli_eventlog_GetLogInformation(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           uint32_t level /* [in]  */,

diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index 94da688f5c846b3dd88870f37fb96eac7b1449ec..2a9b8246012940dd6e95a429fa3a0c8b1be19f00 100644 (file)
--- a/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
@@ -39,32 +39,6 @@ struct eventlog_OpenUnknown0 {
        uint16_t unknown1;
 };
 
-struct eventlog_Record {
-       uint32_t size;
-       const char *reserved;/* [value("eLfL"),charset(DOS)] */
-       uint32_t record_number;
-       time_t time_generated;
-       time_t time_written;
-       uint32_t event_id;
-       enum eventlogEventTypes event_type;
-       uint16_t num_of_strings;/* [range(0,256)] */
-       uint16_t event_category;
-       uint16_t reserved_flags;
-       uint32_t closing_record_number;
-       uint32_t stringoffset;
-       uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */
-       uint32_t sid_offset;
-       uint32_t data_length;
-       uint32_t data_offset;
-       const char * source_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       struct dom_sid0 sid;/* [subcontext_size(sid_size),subcontext(0)] */
-       const char * *strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       const char * raw_data;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
-       DATA_BLOB _padding;/* [flag(LIBNDR_FLAG_ALIGN4)] */
-       uint32_t size2;/* [value(size)] */
-}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
-
 struct eventlog_Record_tdb {
        uint32_t size;
        const char *reserved;/* [value("eLfL"),charset(DOS)] */
@@ -437,7 +411,7 @@ struct eventlog_WriteClusterEvents {
 };
 
 
-struct eventlog_GetLogIntormation {
+struct eventlog_GetLogInformation {
        struct {
                struct policy_handle *handle;/* [ref] */
                uint32_t level;

diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c
index 0d5654c6401430660536f902f970f7f276f98a93..3f19902690d6dc27ae94511c2a42cd782e063780 100644 (file)
--- a/librpc/gen_ndr/ndr_eventlog.c
+++ b/librpc/gen_ndr/ndr_eventlog.c
@@ -92,201 +92,6 @@ _PUBLIC_ void ndr_print_eventlog_OpenUnknown0(struct ndr_print *ndr, const char
        ndr->depth--;
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push_eventlog_Record(struct ndr_push *ndr, int ndr_flags, const struct eventlog_Record *r)
-{
-       uint32_t cntr_strings_0;
-       {
-               uint32_t _flags_save_STRUCT = ndr->flags;
-               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
-               if (ndr_flags & NDR_SCALARS) {
-                       NDR_CHECK(ndr_push_align(ndr, 4));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->size));
-                       NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, "eLfL", 4, sizeof(uint8_t), CH_DOS));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->record_number));
-                       NDR_CHECK(ndr_push_time_t(ndr, NDR_SCALARS, r->time_generated));
-                       NDR_CHECK(ndr_push_time_t(ndr, NDR_SCALARS, r->time_written));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->event_id));
-                       NDR_CHECK(ndr_push_eventlogEventTypes(ndr, NDR_SCALARS, r->event_type));
-                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_of_strings));
-                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->event_category));
-                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->reserved_flags));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->closing_record_number));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->stringoffset));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_dom_sid0(&r->sid, ndr->flags)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sid_offset));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->data_length));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->data_offset));
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->source_name));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->computer_name));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               struct ndr_push *_ndr_sid;
-                               NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_sid, 0, ndr_size_dom_sid0(&r->sid, ndr->flags)));
-                               NDR_CHECK(ndr_push_dom_sid0(_ndr_sid, NDR_SCALARS|NDR_BUFFERS, &r->sid));
-                               NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_sid, 0, ndr_size_dom_sid0(&r->sid, ndr->flags)));
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               for (cntr_strings_0 = 0; cntr_strings_0 < r->num_of_strings; cntr_strings_0++) {
-                                       NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->strings[cntr_strings_0]));
-                               }
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->raw_data));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_DATA_BLOB = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
-                               NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_padding));
-                               ndr->flags = _flags_save_DATA_BLOB;
-                       }
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->size));
-               }
-               if (ndr_flags & NDR_BUFFERS) {
-               }
-               ndr->flags = _flags_save_STRUCT;
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull_eventlog_Record(struct ndr_pull *ndr, int ndr_flags, struct eventlog_Record *r)
-{
-       uint32_t cntr_strings_0;
-       TALLOC_CTX *_mem_save_strings_0;
-       {
-               uint32_t _flags_save_STRUCT = ndr->flags;
-               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
-               if (ndr_flags & NDR_SCALARS) {
-                       NDR_CHECK(ndr_pull_align(ndr, 4));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
-                       NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->reserved, 4, sizeof(uint8_t), CH_DOS));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->record_number));
-                       NDR_CHECK(ndr_pull_time_t(ndr, NDR_SCALARS, &r->time_generated));
-                       NDR_CHECK(ndr_pull_time_t(ndr, NDR_SCALARS, &r->time_written));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->event_id));
-                       NDR_CHECK(ndr_pull_eventlogEventTypes(ndr, NDR_SCALARS, &r->event_type));
-                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_of_strings));
-                       if (r->num_of_strings > 256) {
-                               return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
-                       }
-                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->event_category));
-                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->reserved_flags));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->closing_record_number));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->stringoffset));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sid_size));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sid_offset));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->data_length));
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->data_offset));
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->source_name));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->computer_name));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               struct ndr_pull *_ndr_sid;
-                               NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_sid, 0, r->sid_size));
-                               NDR_CHECK(ndr_pull_dom_sid0(_ndr_sid, NDR_SCALARS|NDR_BUFFERS, &r->sid));
-                               NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_sid, 0, r->sid_size));
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_PULL_ALLOC_N(ndr, r->strings, r->num_of_strings);
-                               _mem_save_strings_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                               NDR_PULL_SET_MEM_CTX(ndr, r->strings, 0);
-                               for (cntr_strings_0 = 0; cntr_strings_0 < r->num_of_strings; cntr_strings_0++) {
-                                       NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->strings[cntr_strings_0]));
-                               }
-                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_strings_0, 0);
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_string = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
-                               NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->raw_data));
-                               ndr->flags = _flags_save_string;
-                       }
-                       {
-                               uint32_t _flags_save_DATA_BLOB = ndr->flags;
-                               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN4);
-                               NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_padding));
-                               ndr->flags = _flags_save_DATA_BLOB;
-                       }
-                       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size2));
-               }
-               if (ndr_flags & NDR_BUFFERS) {
-               }
-               ndr->flags = _flags_save_STRUCT;
-       }
-       return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ void ndr_print_eventlog_Record(struct ndr_print *ndr, const char *name, const struct eventlog_Record *r)
-{
-       uint32_t cntr_strings_0;
-       ndr_print_struct(ndr, name, "eventlog_Record");
-       {
-               uint32_t _flags_save_STRUCT = ndr->flags;
-               ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
-               ndr->depth++;
-               ndr_print_uint32(ndr, "size", r->size);
-               ndr_print_string(ndr, "reserved", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?"eLfL":r->reserved);
-               ndr_print_uint32(ndr, "record_number", r->record_number);
-               ndr_print_time_t(ndr, "time_generated", r->time_generated);
-               ndr_print_time_t(ndr, "time_written", r->time_written);
-               ndr_print_uint32(ndr, "event_id", r->event_id);
-               ndr_print_eventlogEventTypes(ndr, "event_type", r->event_type);
-               ndr_print_uint16(ndr, "num_of_strings", r->num_of_strings);
-               ndr_print_uint16(ndr, "event_category", r->event_category);
-               ndr_print_uint16(ndr, "reserved_flags", r->reserved_flags);
-               ndr_print_uint32(ndr, "closing_record_number", r->closing_record_number);
-               ndr_print_uint32(ndr, "stringoffset", r->stringoffset);
-               ndr_print_uint32(ndr, "sid_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_dom_sid0(&r->sid, ndr->flags):r->sid_size);
-               ndr_print_uint32(ndr, "sid_offset", r->sid_offset);
-               ndr_print_uint32(ndr, "data_length", r->data_length);
-               ndr_print_uint32(ndr, "data_offset", r->data_offset);
-               ndr_print_string(ndr, "source_name", r->source_name);
-               ndr_print_string(ndr, "computer_name", r->computer_name);
-               ndr_print_dom_sid0(ndr, "sid", &r->sid);
-               ndr->print(ndr, "%s: ARRAY(%d)", "strings", (int)r->num_of_strings);
-               ndr->depth++;
-               for (cntr_strings_0=0;cntr_strings_0<r->num_of_strings;cntr_strings_0++) {
-                       char *idx_0=NULL;
-                       if (asprintf(&idx_0, "[%d]", cntr_strings_0) != -1) {
-                               ndr_print_string(ndr, "strings", r->strings[cntr_strings_0]);
-                               free(idx_0);
-                       }
-               }
-               ndr->depth--;
-               ndr_print_string(ndr, "raw_data", r->raw_data);
-               ndr_print_DATA_BLOB(ndr, "_padding", r->_padding);
-               ndr_print_uint32(ndr, "size2", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->size:r->size2);
-               ndr->depth--;
-               ndr->flags = _flags_save_STRUCT;
-       }
-}
-
 _PUBLIC_ enum ndr_err_code ndr_push_eventlog_Record_tdb(struct ndr_push *ndr, int ndr_flags, const struct eventlog_Record_tdb *r)
 {
        uint32_t cntr_strings_0;
@@ -2589,7 +2394,7 @@ _PUBLIC_ void ndr_print_eventlog_WriteClusterEvents(struct ndr_print *ndr, const
        ndr->depth--;
 }
 
-static enum ndr_err_code ndr_push_eventlog_GetLogIntormation(struct ndr_push *ndr, int flags, const struct eventlog_GetLogIntormation *r)
+static enum ndr_err_code ndr_push_eventlog_GetLogInformation(struct ndr_push *ndr, int flags, const struct eventlog_GetLogInformation *r)
 {
        if (flags & NDR_IN) {
                if (r->in.handle == NULL) {
@@ -2614,7 +2419,7 @@ static enum ndr_err_code ndr_push_eventlog_GetLogIntormation(struct ndr_push *nd
        return NDR_ERR_SUCCESS;
 }
 
-static enum ndr_err_code ndr_pull_eventlog_GetLogIntormation(struct ndr_pull *ndr, int flags, struct eventlog_GetLogIntormation *r)
+static enum ndr_err_code ndr_pull_eventlog_GetLogInformation(struct ndr_pull *ndr, int flags, struct eventlog_GetLogInformation *r)
 {
        TALLOC_CTX *_mem_save_handle_0;
        TALLOC_CTX *_mem_save_bytes_needed_0;
@@ -2659,15 +2464,15 @@ static enum ndr_err_code ndr_pull_eventlog_GetLogIntormation(struct ndr_pull *nd
        return NDR_ERR_SUCCESS;
 }
 
-_PUBLIC_ void ndr_print_eventlog_GetLogIntormation(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_GetLogIntormation *r)
+_PUBLIC_ void ndr_print_eventlog_GetLogInformation(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_GetLogInformation *r)
 {
-       ndr_print_struct(ndr, name, "eventlog_GetLogIntormation");
+       ndr_print_struct(ndr, name, "eventlog_GetLogInformation");
        ndr->depth++;
        if (flags & NDR_SET_VALUES) {
                ndr->flags |= LIBNDR_PRINT_SET_VALUES;
        }
        if (flags & NDR_IN) {
-               ndr_print_struct(ndr, "in", "eventlog_GetLogIntormation");
+               ndr_print_struct(ndr, "in", "eventlog_GetLogInformation");
                ndr->depth++;
                ndr_print_ptr(ndr, "handle", r->in.handle);
                ndr->depth++;
@@ -2678,7 +2483,7 @@ _PUBLIC_ void ndr_print_eventlog_GetLogIntormation(struct ndr_print *ndr, const
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
-               ndr_print_struct(ndr, "out", "eventlog_GetLogIntormation");
+               ndr_print_struct(ndr, "out", "eventlog_GetLogInformation");
                ndr->depth++;
                ndr_print_ptr(ndr, "buffer", r->out.buffer);
                ndr->depth++;
@@ -3267,11 +3072,11 @@ static const struct ndr_interface_call eventlog_calls[] = {
                false,
        },
        {
-               "eventlog_GetLogIntormation",
-               sizeof(struct eventlog_GetLogIntormation),
-               (ndr_push_flags_fn_t) ndr_push_eventlog_GetLogIntormation,
-               (ndr_pull_flags_fn_t) ndr_pull_eventlog_GetLogIntormation,
-               (ndr_print_function_t) ndr_print_eventlog_GetLogIntormation,
+               "eventlog_GetLogInformation",
+               sizeof(struct eventlog_GetLogInformation),
+               (ndr_push_flags_fn_t) ndr_push_eventlog_GetLogInformation,
+               (ndr_pull_flags_fn_t) ndr_pull_eventlog_GetLogInformation,
+               (ndr_print_function_t) ndr_print_eventlog_GetLogInformation,
                false,
        },
        {

diff --git a/librpc/gen_ndr/ndr_eventlog.h b/librpc/gen_ndr/ndr_eventlog.h
index 34e6e09637c38f4c85e11c64f651ab9142f38c83..39f5f1bbc8ca3479bef805cc15e3e9b153b3f409 100644 (file)
--- a/librpc/gen_ndr/ndr_eventlog.h
+++ b/librpc/gen_ndr/ndr_eventlog.h
@@ -55,7 +55,7 @@ extern const struct ndr_interface_table ndr_table_eventlog;
 
 #define NDR_EVENTLOG_WRITECLUSTEREVENTS (0x15)
 
-#define NDR_EVENTLOG_GETLOGINTORMATION (0x16)
+#define NDR_EVENTLOG_GETLOGINFORMATION (0x16)
 
 #define NDR_EVENTLOG_FLUSHEVENTLOG (0x17)
 
@@ -67,9 +67,6 @@ enum ndr_err_code ndr_push_eventlogEventTypes(struct ndr_push *ndr, int ndr_flag
 enum ndr_err_code ndr_pull_eventlogEventTypes(struct ndr_pull *ndr, int ndr_flags, enum eventlogEventTypes *r);
 void ndr_print_eventlogEventTypes(struct ndr_print *ndr, const char *name, enum eventlogEventTypes r);
 void ndr_print_eventlog_OpenUnknown0(struct ndr_print *ndr, const char *name, const struct eventlog_OpenUnknown0 *r);
-enum ndr_err_code ndr_push_eventlog_Record(struct ndr_push *ndr, int ndr_flags, const struct eventlog_Record *r);
-enum ndr_err_code ndr_pull_eventlog_Record(struct ndr_pull *ndr, int ndr_flags, struct eventlog_Record *r);
-void ndr_print_eventlog_Record(struct ndr_print *ndr, const char *name, const struct eventlog_Record *r);
 enum ndr_err_code ndr_push_eventlog_Record_tdb(struct ndr_push *ndr, int ndr_flags, const struct eventlog_Record_tdb *r);
 enum ndr_err_code ndr_pull_eventlog_Record_tdb(struct ndr_pull *ndr, int ndr_flags, struct eventlog_Record_tdb *r);
 void ndr_print_eventlog_Record_tdb(struct ndr_print *ndr, const char *name, const struct eventlog_Record_tdb *r);
@@ -109,7 +106,7 @@ void ndr_print_eventlog_ReportEventA(struct ndr_print *ndr, const char *name, in
 void ndr_print_eventlog_RegisterClusterSvc(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_RegisterClusterSvc *r);
 void ndr_print_eventlog_DeregisterClusterSvc(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_DeregisterClusterSvc *r);
 void ndr_print_eventlog_WriteClusterEvents(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_WriteClusterEvents *r);
-void ndr_print_eventlog_GetLogIntormation(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_GetLogIntormation *r);
+void ndr_print_eventlog_GetLogInformation(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_GetLogInformation *r);
 void ndr_print_eventlog_FlushEventLog(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_FlushEventLog *r);
 void ndr_print_eventlog_ReportEventAndSourceW(struct ndr_print *ndr, const char *name, int flags, const struct eventlog_ReportEventAndSourceW *r);
 #endif /* _HEADER_NDR_eventlog */

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 9ec3f35930a88a9a10a50aa50303e945d801c0ca..b0d536663687a624bc83e49aae4941f2e6c86423 100644 (file)
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -13226,13 +13226,35 @@ _PUBLIC_ void ndr_print_spoolss_NotifyOptionType(struct ndr_print *ndr, const ch
        ndr->depth--;
 }
 
+static enum ndr_err_code ndr_push_spoolssNotifyOptionFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolssNotifyOptionFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       *r = v;
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolssNotifyOptionFlags(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+       ndr_print_uint32(ndr, name, r);
+       ndr->depth++;
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "PRINTER_NOTIFY_OPTIONS_REFRESH", PRINTER_NOTIFY_OPTIONS_REFRESH, r);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_spoolss_NotifyOption(struct ndr_push *ndr, int ndr_flags, const struct spoolss_NotifyOption *r)
 {
        uint32_t cntr_types_1;
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags));
+               NDR_CHECK(ndr_push_spoolssNotifyOptionFlags(ndr, NDR_SCALARS, r->flags));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->types));
        }
@@ -13259,7 +13281,7 @@ static enum ndr_err_code ndr_pull_spoolss_NotifyOption(struct ndr_pull *ndr, int
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags));
+               NDR_CHECK(ndr_pull_spoolssNotifyOptionFlags(ndr, NDR_SCALARS, &r->flags));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_types));
                if (_ptr_types) {
@@ -13298,7 +13320,7 @@ _PUBLIC_ void ndr_print_spoolss_NotifyOption(struct ndr_print *ndr, const char *
        ndr_print_struct(ndr, name, "spoolss_NotifyOption");
        ndr->depth++;
        ndr_print_uint32(ndr, "version", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?2:r->version);
-       ndr_print_uint32(ndr, "flags", r->flags);
+       ndr_print_spoolssNotifyOptionFlags(ndr, "flags", r->flags);
        ndr_print_uint32(ndr, "count", r->count);
        ndr_print_ptr(ndr, "types", r->types);
        ndr->depth++;

diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index f8d97c19a72ccaf2b05783e18c643ed906c4ec9e..b9a533ab382b26cc404f2e8cad3387b6dcd2dec1 100644 (file)
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -334,6 +334,7 @@ void ndr_print_spoolss_PrinterChangeFlags(struct ndr_print *ndr, const char *nam
 void ndr_print_spoolss_Field(struct ndr_print *ndr, const char *name, enum spoolss_Field r);
 void ndr_print_spoolss_NotifyType(struct ndr_print *ndr, const char *name, enum spoolss_NotifyType r);
 void ndr_print_spoolss_NotifyOptionType(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOptionType *r);
+void ndr_print_spoolssNotifyOptionFlags(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_spoolss_NotifyOption(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyOption *r);
 void ndr_print_spoolss_NotifyString(struct ndr_print *ndr, const char *name, const struct spoolss_NotifyString *r);
 void ndr_print_spoolss_NotifyTable(struct ndr_print *ndr, const char *name, enum spoolss_NotifyTable r);

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 2faeea2e4064069731e2e3af4017908a691a5b77..756a992e17cc10bfd6aed8035902d7a8de10f261 100644 (file)
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1072,6 +1072,9 @@ struct spoolss_NotifyOptionType {
        enum spoolss_Field *fields;/* [unique,size_is(count)] */
 };
 
+/* bitmap spoolssNotifyOptionFlags */
+#define PRINTER_NOTIFY_OPTIONS_REFRESH ( 0x00000001 )
+
 struct spoolss_NotifyOption {
        uint32_t version;/* [value(2)] */
        uint32_t flags;

diff --git a/librpc/gen_ndr/srv_eventlog.c b/librpc/gen_ndr/srv_eventlog.c
index 795afc9a5ada6ac2620a83d5c73cb8c3bf76e1ed..2cab792adf9b146f935d0792be71f986ca626be7 100644 (file)
--- a/librpc/gen_ndr/srv_eventlog.c
+++ b/librpc/gen_ndr/srv_eventlog.c
@@ -1673,18 +1673,18 @@ static bool api_eventlog_WriteClusterEvents(pipes_struct *p)
        return true;
 }
 
-static bool api_eventlog_GetLogIntormation(pipes_struct *p)
+static bool api_eventlog_GetLogInformation(pipes_struct *p)
 {
        const struct ndr_interface_call *call;
        struct ndr_pull *pull;
        struct ndr_push *push;
        enum ndr_err_code ndr_err;
        DATA_BLOB blob;
-       struct eventlog_GetLogIntormation *r;
+       struct eventlog_GetLogInformation *r;
 
-       call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETLOGINTORMATION];
+       call = &ndr_table_eventlog.calls[NDR_EVENTLOG_GETLOGINFORMATION];
 
-       r = talloc(talloc_tos(), struct eventlog_GetLogIntormation);
+       r = talloc(talloc_tos(), struct eventlog_GetLogInformation);
        if (r == NULL) {
                return false;
        }
@@ -1708,7 +1708,7 @@ static bool api_eventlog_GetLogIntormation(pipes_struct *p)
        }
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_IN_DEBUG(eventlog_GetLogIntormation, r);
+               NDR_PRINT_IN_DEBUG(eventlog_GetLogInformation, r);
        }
 
        ZERO_STRUCT(r->out);
@@ -1724,7 +1724,7 @@ static bool api_eventlog_GetLogIntormation(pipes_struct *p)
                return false;
        }
 
-       r->out.result = _eventlog_GetLogIntormation(p, r);
+       r->out.result = _eventlog_GetLogInformation(p, r);
 
        if (p->rng_fault_state) {
                talloc_free(r);
@@ -1733,7 +1733,7 @@ static bool api_eventlog_GetLogIntormation(pipes_struct *p)
        }
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_OUT_DEBUG(eventlog_GetLogIntormation, r);
+               NDR_PRINT_OUT_DEBUG(eventlog_GetLogInformation, r);
        }
 
        push = ndr_push_init_ctx(r, NULL);
@@ -1934,7 +1934,7 @@ static struct api_struct api_eventlog_cmds[] =
        {"EVENTLOG_REGISTERCLUSTERSVC", NDR_EVENTLOG_REGISTERCLUSTERSVC, api_eventlog_RegisterClusterSvc},
        {"EVENTLOG_DEREGISTERCLUSTERSVC", NDR_EVENTLOG_DEREGISTERCLUSTERSVC, api_eventlog_DeregisterClusterSvc},
        {"EVENTLOG_WRITECLUSTEREVENTS", NDR_EVENTLOG_WRITECLUSTEREVENTS, api_eventlog_WriteClusterEvents},
-       {"EVENTLOG_GETLOGINTORMATION", NDR_EVENTLOG_GETLOGINTORMATION, api_eventlog_GetLogIntormation},
+       {"EVENTLOG_GETLOGINFORMATION", NDR_EVENTLOG_GETLOGINFORMATION, api_eventlog_GetLogInformation},
        {"EVENTLOG_FLUSHEVENTLOG", NDR_EVENTLOG_FLUSHEVENTLOG, api_eventlog_FlushEventLog},
        {"EVENTLOG_REPORTEVENTANDSOURCEW", NDR_EVENTLOG_REPORTEVENTANDSOURCEW, api_eventlog_ReportEventAndSourceW},
 };
@@ -2138,8 +2138,8 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                        return NT_STATUS_OK;
                }
 
-               case NDR_EVENTLOG_GETLOGINTORMATION: {
-                       struct eventlog_GetLogIntormation *r = (struct eventlog_GetLogIntormation *)_r;
+               case NDR_EVENTLOG_GETLOGINFORMATION: {
+                       struct eventlog_GetLogInformation *r = (struct eventlog_GetLogInformation *)_r;
                        ZERO_STRUCT(r->out);
                        r->out.buffer = talloc_zero_array(mem_ctx, uint8_t, r->in.buf_size);
                        if (r->out.buffer == NULL) {
@@ -2151,7 +2151,7 @@ NTSTATUS rpc_eventlog_dispatch(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                        return NT_STATUS_NO_MEMORY;
                        }
 
-                       r->out.result = _eventlog_GetLogIntormation(cli->pipes_struct, r);
+                       r->out.result = _eventlog_GetLogInformation(cli->pipes_struct, r);
                        return NT_STATUS_OK;
                }
 

diff --git a/librpc/gen_ndr/srv_eventlog.h b/librpc/gen_ndr/srv_eventlog.h
index 11d6886a24e0de36218f4463e3329c655a9288f5..7da7cddbd23214993c55fe1d0c2914bf916cdffd 100644 (file)
--- a/librpc/gen_ndr/srv_eventlog.h
+++ b/librpc/gen_ndr/srv_eventlog.h
@@ -23,7 +23,7 @@ NTSTATUS _eventlog_ReportEventA(pipes_struct *p, struct eventlog_ReportEventA *r
 NTSTATUS _eventlog_RegisterClusterSvc(pipes_struct *p, struct eventlog_RegisterClusterSvc *r);
 NTSTATUS _eventlog_DeregisterClusterSvc(pipes_struct *p, struct eventlog_DeregisterClusterSvc *r);
 NTSTATUS _eventlog_WriteClusterEvents(pipes_struct *p, struct eventlog_WriteClusterEvents *r);
-NTSTATUS _eventlog_GetLogIntormation(pipes_struct *p, struct eventlog_GetLogIntormation *r);
+NTSTATUS _eventlog_GetLogInformation(pipes_struct *p, struct eventlog_GetLogInformation *r);
 NTSTATUS _eventlog_FlushEventLog(pipes_struct *p, struct eventlog_FlushEventLog *r);
 NTSTATUS _eventlog_ReportEventAndSourceW(pipes_struct *p, struct eventlog_ReportEventAndSourceW *r);
 void eventlog_get_pipe_fns(struct api_struct **fns, int *n_fns);
@@ -50,7 +50,7 @@ NTSTATUS _eventlog_ReportEventA(pipes_struct *p, struct eventlog_ReportEventA *r
 NTSTATUS _eventlog_RegisterClusterSvc(pipes_struct *p, struct eventlog_RegisterClusterSvc *r);
 NTSTATUS _eventlog_DeregisterClusterSvc(pipes_struct *p, struct eventlog_DeregisterClusterSvc *r);
 NTSTATUS _eventlog_WriteClusterEvents(pipes_struct *p, struct eventlog_WriteClusterEvents *r);
-NTSTATUS _eventlog_GetLogIntormation(pipes_struct *p, struct eventlog_GetLogIntormation *r);
+NTSTATUS _eventlog_GetLogInformation(pipes_struct *p, struct eventlog_GetLogInformation *r);
 NTSTATUS _eventlog_FlushEventLog(pipes_struct *p, struct eventlog_FlushEventLog *r);
 NTSTATUS _eventlog_ReportEventAndSourceW(pipes_struct *p, struct eventlog_ReportEventAndSourceW *r);
 NTSTATUS rpc_eventlog_init(void);