The branch, master has been updated
via 0277143... s3: re-run make samba3-idl.
via 5b3c22e... spoolss: make spoolss_SetPrinterInfo0 match changes in
spoolss_PrinterInfo0.
from fdf4d3e... s4-waf: fixed WINBINDD_SOCKET_DIR for wb_common in s4
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0277143ca6224e4219d6b95746c02c8ca9a6abf6
Author: Günther Deschner <[email protected]>
Date: Tue Apr 13 23:51:36 2010 +0200
s3: re-run make samba3-idl.
Guenther
commit 5b3c22e96fdc54cb60ac6f4d5e9a76a83fe477af
Author: Günther Deschner <[email protected]>
Date: Tue Apr 13 23:50:58 2010 +0200
spoolss: make spoolss_SetPrinterInfo0 match changes in spoolss_PrinterInfo0.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 18 +++++++++---------
librpc/gen_ndr/spoolss.h | 2 +-
librpc/idl/spoolss.idl | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 8868ec0..a2355b7 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -331,7 +331,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->global_counter));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->total_pages));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->version));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->free_build));
+ NDR_CHECK(ndr_push_spoolss_Build(ndr, NDR_SCALARS,
r->free_build));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->spooling));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->max_spooling));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->session_counter));
@@ -417,7 +417,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->global_counter));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->total_pages));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->free_build));
+ NDR_CHECK(ndr_pull_spoolss_Build(ndr, NDR_SCALARS,
&r->free_build));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->spooling));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_spooling));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->session_counter));
@@ -503,7 +503,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo0(struct
ndr_print *ndr, const char *
ndr_print_uint32(ndr, "global_counter", r->global_counter);
ndr_print_uint32(ndr, "total_pages", r->total_pages);
ndr_print_uint32(ndr, "version", r->version);
- ndr_print_uint32(ndr, "free_build", r->free_build);
+ ndr_print_spoolss_Build(ndr, "free_build", r->free_build);
ndr_print_uint32(ndr, "spooling", r->spooling);
ndr_print_uint32(ndr, "max_spooling", r->max_spooling);
ndr_print_uint32(ndr, "session_counter", r->session_counter);
@@ -6854,13 +6854,13 @@ static enum ndr_err_code
ndr_push_spoolss_SetPrinterInfo0(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->session_counter));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->num_error_out_of_paper));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->num_error_not_ready));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->job_error));
+ NDR_CHECK(ndr_push_spoolss_JobStatus(ndr, NDR_SCALARS,
r->job_error));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->number_of_processors));
NDR_CHECK(ndr_push_spoolss_ProcessorType(ndr, NDR_SCALARS,
r->processor_type));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->high_part_total_bytes));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->change_id));
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->last_error));
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->status));
+ NDR_CHECK(ndr_push_spoolss_PrinterStatus(ndr, NDR_SCALARS,
r->status));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->enumerate_network_printers));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->c_setprinter));
NDR_CHECK(ndr_push_spoolss_ProcessorArchitecture(ndr,
NDR_SCALARS, r->processor_architecture));
@@ -6920,13 +6920,13 @@ static enum ndr_err_code
ndr_pull_spoolss_SetPrinterInfo0(struct ndr_pull *ndr,
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->session_counter));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->num_error_out_of_paper));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->num_error_not_ready));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->job_error));
+ NDR_CHECK(ndr_pull_spoolss_JobStatus(ndr, NDR_SCALARS,
&r->job_error));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->number_of_processors));
NDR_CHECK(ndr_pull_spoolss_ProcessorType(ndr, NDR_SCALARS,
&r->processor_type));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->high_part_total_bytes));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->change_id));
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->last_error));
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->status));
+ NDR_CHECK(ndr_pull_spoolss_PrinterStatus(ndr, NDR_SCALARS,
&r->status));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->enumerate_network_printers));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->c_setprinter));
NDR_CHECK(ndr_pull_spoolss_ProcessorArchitecture(ndr,
NDR_SCALARS, &r->processor_architecture));
@@ -6994,13 +6994,13 @@ _PUBLIC_ void ndr_print_spoolss_SetPrinterInfo0(struct
ndr_print *ndr, const cha
ndr_print_uint32(ndr, "session_counter", r->session_counter);
ndr_print_uint32(ndr, "num_error_out_of_paper",
r->num_error_out_of_paper);
ndr_print_uint32(ndr, "num_error_not_ready", r->num_error_not_ready);
- ndr_print_uint32(ndr, "job_error", r->job_error);
+ ndr_print_spoolss_JobStatus(ndr, "job_error", r->job_error);
ndr_print_uint32(ndr, "number_of_processors", r->number_of_processors);
ndr_print_spoolss_ProcessorType(ndr, "processor_type",
r->processor_type);
ndr_print_uint32(ndr, "high_part_total_bytes",
r->high_part_total_bytes);
ndr_print_uint32(ndr, "change_id", r->change_id);
ndr_print_WERROR(ndr, "last_error", r->last_error);
- ndr_print_uint32(ndr, "status", r->status);
+ ndr_print_spoolss_PrinterStatus(ndr, "status", r->status);
ndr_print_uint32(ndr, "enumerate_network_printers",
r->enumerate_network_printers);
ndr_print_uint32(ndr, "c_setprinter", r->c_setprinter);
ndr_print_spoolss_ProcessorArchitecture(ndr, "processor_architecture",
r->processor_architecture);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 2a05f3e..f1f0c4f 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -253,7 +253,7 @@ struct spoolss_PrinterInfo0 {
uint32_t global_counter;
uint32_t total_pages;
uint32_t version;
- uint32_t free_build;
+ enum spoolss_Build free_build;
uint32_t spooling;
uint32_t max_spooling;
uint32_t session_counter;
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index a9e261f..1e5d1f2 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -129,7 +129,7 @@ cpp_quote("#define spoolss_security_descriptor
security_descriptor")
uint32 global_counter;
uint32 total_pages;
uint32 version;
- uint32 free_build;
+ spoolss_Build free_build;
uint32 spooling;
uint32 max_spooling;
uint32 session_counter;
@@ -1167,13 +1167,13 @@ cpp_quote("#define spoolss_security_descriptor
security_descriptor")
uint32 session_counter;
uint32 num_error_out_of_paper;
uint32 num_error_not_ready;
- uint32 job_error;
+ spoolss_JobStatus job_error;
uint32 number_of_processors;
spoolss_ProcessorType processor_type;
uint32 high_part_total_bytes;
uint32 change_id;
WERROR last_error;
- uint32 status;
+ spoolss_PrinterStatus status;
uint32 enumerate_network_printers;
uint32 c_setprinter;
spoolss_ProcessorArchitecture processor_architecture;
--
Samba Shared Repository
