[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-1066-g2ad2b6f
Günther Deschner
gd at samba.org
Sat Feb 21 20:26:58 GMT 2009
The branch, master has been updated
via 2ad2b6f723964ed6e5d1d12c8403bd3d4147dc84 (commit)
via 35d6234998639fff444671ec04693043a1e28d07 (commit)
via d3372c6a9e69360afd2f12168e9df09dec45ae08 (commit)
via 762b92e285b7d98936393fc61a5ab18c66e9d534 (commit)
via 24373c16a5b3e96ea3adc18e7aac837be59fb2c2 (commit)
via 3bd612527d9c25ee5a7f33fce0ba2902bb15a4d6 (commit)
via acfa1278ae6611783f9a13e54ac78c10bc828b9f (commit)
via dc8ab10d3d321e8389391f485d6ed177534de2cb (commit)
via 80cd7ed51998daea5233ce17a72ae470d438425c (commit)
from c9a057bc0497fd201142799d02f046e95236f921 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2ad2b6f723964ed6e5d1d12c8403bd3d4147dc84
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 21 21:07:37 2009 +0100
s3-spoolss: fix client name in rpccli_spoolss_openprinter_ex.
Guenther
commit 35d6234998639fff444671ec04693043a1e28d07
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 21 21:03:36 2009 +0100
s3-spoolss: remove duplicate flag.
Guenther
commit d3372c6a9e69360afd2f12168e9df09dec45ae08
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 20 14:55:31 2009 +0100
s3-spoolss: fix _spoolss_GetPrinterDriverDirectory and spoolss_GetPrintProcessorDirectory.
Both calls need to return NULL in the error case to avoid ndr encoding problems.
(found by smbtorture spoolss test).
Guenther
commit 762b92e285b7d98936393fc61a5ab18c66e9d534
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 20 14:24:59 2009 +0100
s3-eventlog: fix rpcclient and server stub for eventlog_GetLogInformation.
Guenther
commit 24373c16a5b3e96ea3adc18e7aac837be59fb2c2
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 20 14:22:39 2009 +0100
s4-smbtorture: fix eventlog getinformation test.
Guenther
commit 3bd612527d9c25ee5a7f33fce0ba2902bb15a4d6
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 21 21:13:46 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit acfa1278ae6611783f9a13e54ac78c10bc828b9f
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 21 21:03:13 2009 +0100
spoolss: add spoolssNotifyOptionFlags.
Guenther
commit dc8ab10d3d321e8389391f485d6ed177534de2cb
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 20 14:20:05 2009 +0100
eventlog: remove unused eventlog_Record struct.
Guenther
commit 80cd7ed51998daea5233ce17a72ae470d438425c
Author: Günther Deschner <gd at samba.org>
Date: Fri Feb 20 14:18:06 2009 +0100
eventlog: fix eventlog_GetLogInformation typo in IDL.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_eventlog.c | 10 +-
librpc/gen_ndr/cli_eventlog.h | 2 +-
librpc/gen_ndr/eventlog.h | 28 +----
librpc/gen_ndr/ndr_eventlog.c | 217 ++--------------------------------
librpc/gen_ndr/ndr_eventlog.h | 7 +-
librpc/gen_ndr/ndr_spoolss.c | 28 ++++-
librpc/gen_ndr/ndr_spoolss.h | 1 +
librpc/gen_ndr/spoolss.h | 3 +
librpc/gen_ndr/srv_eventlog.c | 22 ++--
librpc/gen_ndr/srv_eventlog.h | 4 +-
librpc/idl/eventlog.idl | 28 +----
librpc/idl/spoolss.idl | 6 +-
source3/include/rpc_spoolss.h | 2 -
source3/rpc_client/cli_spoolss.c | 3 +-
source3/rpc_server/srv_eventlog_nt.c | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 4 +-
source3/rpcclient/cmd_eventlog.c | 4 +-
source4/torture/rpc/eventlog.c | 8 +-
18 files changed, 79 insertions(+), 300 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index 6b084d2..b9cf39d 100644
--- 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 ae5544d..d905676 100644
--- 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 94da688..2a9b824 100644
--- 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 0d5654c..3f19902 100644
--- 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 34e6e09..39f5f1b 100644
--- 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 9ec3f35..b0d5366 100644
--- 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 f8d97c1..b9a533a 100644
--- 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 2faeea2..756a992 100644
--- 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 795afc9..2cab792 100644
--- 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list