[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-962-g6a53ff1
Günther Deschner
gd at samba.org
Wed Feb 18 13:48:04 GMT 2009
The branch, master has been updated
via 6a53ff1ea8ca6eee81652a68fb49b2871c327b72 (commit)
via 2e59cb50cc1d6f2fba815c54a7df0704398e3398 (commit)
via 719221168f9ba6effce1b88fefd12f4fab515e9d (commit)
from 975a881d54a4223fa616895778a69b08e9243aae (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6a53ff1ea8ca6eee81652a68fb49b2871c327b72
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 18 14:47:33 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 2e59cb50cc1d6f2fba815c54a7df0704398e3398
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 17 14:21:16 2009 +0100
spoolss: add spoolss_MonitorUi struct.
Guenther
commit 719221168f9ba6effce1b88fefd12f4fab515e9d
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 17 11:31:23 2009 +0100
spoolss: add spoolss_PortData1.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 136 ++++++++++++++++++++++++++++++++++++++++++
librpc/gen_ndr/ndr_spoolss.h | 7 ++
librpc/gen_ndr/spoolss.h | 35 +++++++++++
librpc/idl/spoolss.idl | 28 +++++++++
4 files changed, 206 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index b9164e3..1230343 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -12445,6 +12445,142 @@ _PUBLIC_ void ndr_print_spoolss_DeleteDriverFlags(struct ndr_print *ndr, const c
ndr->depth--;
}
+static enum ndr_err_code ndr_push_spoolss_PortProtocol(struct ndr_push *ndr, int ndr_flags, enum spoolss_PortProtocol r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_PortProtocol(struct ndr_pull *ndr, int ndr_flags, enum spoolss_PortProtocol *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_PortProtocol(struct ndr_print *ndr, const char *name, enum spoolss_PortProtocol r)
+{
+ const char *val = NULL;
+
+ switch (r) {
+ case PROTOCOL_RAWTCP_TYPE: val = "PROTOCOL_RAWTCP_TYPE"; break;
+ case PROTOCOL_LPR_TYPE: val = "PROTOCOL_LPR_TYPE"; break;
+ }
+ ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortData1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PortData1 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->portname, 64, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0x00000001));
+ NDR_CHECK(ndr_push_spoolss_PortProtocol(ndr, NDR_SCALARS, r->protocol));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, sizeof(r)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->reserved));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->hostaddress, 49, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->snmpcommunity, 33, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->dblspool));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->queue, 33, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->ip_address, 16, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->hardware_address, 13, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->device_type, 257, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->port_number));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->snmp_enabled));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->snmp_dev_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortData1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PortData1 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->portname, 64, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
+ NDR_CHECK(ndr_pull_spoolss_PortProtocol(ndr, NDR_SCALARS, &r->protocol));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->hostaddress, 49, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->snmpcommunity, 33, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->dblspool));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->queue, 33, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->ip_address, 16, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->hardware_address, 13, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->device_type, 257, sizeof(uint16_t), CH_UTF16));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->port_number));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->snmp_enabled));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->snmp_dev_index));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_PortData1(struct ndr_print *ndr, const char *name, const struct spoolss_PortData1 *r)
+{
+ ndr_print_struct(ndr, name, "spoolss_PortData1");
+ ndr->depth++;
+ ndr_print_string(ndr, "portname", r->portname);
+ ndr_print_uint32(ndr, "version", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?0x00000001:r->version);
+ ndr_print_spoolss_PortProtocol(ndr, "protocol", r->protocol);
+ ndr_print_uint32(ndr, "size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?sizeof(r):r->size);
+ ndr_print_uint32(ndr, "reserved", r->reserved);
+ ndr_print_string(ndr, "hostaddress", r->hostaddress);
+ ndr_print_string(ndr, "snmpcommunity", r->snmpcommunity);
+ ndr_print_uint32(ndr, "dblspool", r->dblspool);
+ ndr_print_string(ndr, "queue", r->queue);
+ ndr_print_string(ndr, "ip_address", r->ip_address);
+ ndr_print_string(ndr, "hardware_address", r->hardware_address);
+ ndr_print_string(ndr, "device_type", r->device_type);
+ ndr_print_uint32(ndr, "port_number", r->port_number);
+ ndr_print_uint32(ndr, "snmp_enabled", r->snmp_enabled);
+ ndr_print_uint32(ndr, "snmp_dev_index", r->snmp_dev_index);
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorUi(struct ndr_push *ndr, int ndr_flags, const struct spoolss_MonitorUi *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dll_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_align(ndr, 2));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dll_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->dll_name, ndr_charset_length(r->dll_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorUi(struct ndr_pull *ndr, int ndr_flags, struct spoolss_MonitorUi *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->dll_name));
+ NDR_CHECK(ndr_pull_align(ndr, 2));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->dll_name));
+ if (ndr_get_array_length(ndr, &r->dll_name) > ndr_get_array_size(ndr, &r->dll_name)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->dll_name), ndr_get_array_length(ndr, &r->dll_name));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->dll_name), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->dll_name, ndr_get_array_length(ndr, &r->dll_name), sizeof(uint16_t), CH_UTF16));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_MonitorUi(struct ndr_print *ndr, const char *name, const struct spoolss_MonitorUi *r)
+{
+ ndr_print_struct(ndr, name, "spoolss_MonitorUi");
+ ndr->depth++;
+ ndr_print_string(ndr, "dll_name", r->dll_name);
+ ndr->depth--;
+}
+
static enum ndr_err_code ndr_push_spoolss_AddPrinterDriverExFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index bf68cdd..0a82a8c 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -337,6 +337,13 @@ void ndr_print_spoolss_UserLevelCtr(struct ndr_print *ndr, const char *name, con
enum ndr_err_code ndr_push_spoolss_DeleteDriverFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r);
enum ndr_err_code ndr_pull_spoolss_DeleteDriverFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
void ndr_print_spoolss_DeleteDriverFlags(struct ndr_print *ndr, const char *name, uint32_t r);
+void ndr_print_spoolss_PortProtocol(struct ndr_print *ndr, const char *name, enum spoolss_PortProtocol r);
+enum ndr_err_code ndr_push_spoolss_PortData1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PortData1 *r);
+enum ndr_err_code ndr_pull_spoolss_PortData1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PortData1 *r);
+void ndr_print_spoolss_PortData1(struct ndr_print *ndr, const char *name, const struct spoolss_PortData1 *r);
+enum ndr_err_code ndr_push_spoolss_MonitorUi(struct ndr_push *ndr, int ndr_flags, const struct spoolss_MonitorUi *r);
+enum ndr_err_code ndr_pull_spoolss_MonitorUi(struct ndr_pull *ndr, int ndr_flags, struct spoolss_MonitorUi *r);
+void ndr_print_spoolss_MonitorUi(struct ndr_print *ndr, const char *name, const struct spoolss_MonitorUi *r);
void ndr_print_spoolss_AddPrinterDriverExFlags(struct ndr_print *ndr, const char *name, uint32_t r);
enum ndr_err_code ndr_push__spoolss_EnumPrinters(struct ndr_push *ndr, int flags, const struct _spoolss_EnumPrinters *r);
enum ndr_err_code ndr_pull__spoolss_EnumPrinters(struct ndr_pull *ndr, int flags, struct _spoolss_EnumPrinters *r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index f3f430d..0e6cf0b 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1138,6 +1138,41 @@ struct spoolss_UserLevelCtr {
#define DPD_DELETE_SPECIFIC_VERSION ( 0x00000002 )
#define DPD_DELETE_ALL_FILES ( 0x00000004 )
+enum spoolss_PortProtocol
+#ifndef USE_UINT_ENUMS
+ {
+ PROTOCOL_RAWTCP_TYPE=1,
+ PROTOCOL_LPR_TYPE=2
+}
+#else
+ { __donnot_use_enum_spoolss_PortProtocol=0x7FFFFFFF}
+#define PROTOCOL_RAWTCP_TYPE ( 1 )
+#define PROTOCOL_LPR_TYPE ( 2 )
+#endif
+;
+
+struct spoolss_PortData1 {
+ const char *portname;/* [charset(UTF16)] */
+ uint32_t version;/* [value(0x00000001)] */
+ enum spoolss_PortProtocol protocol;
+ uint32_t size;/* [value(sizeof(r))] */
+ uint32_t reserved;
+ const char *hostaddress;/* [charset(UTF16)] */
+ const char *snmpcommunity;/* [charset(UTF16)] */
+ uint32_t dblspool;
+ const char *queue;/* [charset(UTF16)] */
+ const char *ip_address;/* [charset(UTF16)] */
+ const char *hardware_address;/* [charset(UTF16)] */
+ const char *device_type;/* [charset(UTF16)] */
+ uint32_t port_number;
+ uint32_t snmp_enabled;
+ uint32_t snmp_dev_index;
+}/* [public] */;
+
+struct spoolss_MonitorUi {
+ const char *dll_name;/* [charset(UTF16)] */
+}/* [public] */;
+
/* bitmap spoolss_AddPrinterDriverExFlags */
#define APD_STRICT_UPGRADE ( 0x00000001 )
#define APD_STRICT_DOWNGRADE ( 0x00000002 )
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 545e103..8847247 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -1938,6 +1938,34 @@ import "misc.idl", "security.idl", "winreg.idl";
/******************/
/* Function: 0x58 */
+
+ typedef [v1_enum] enum {
+ PROTOCOL_RAWTCP_TYPE = 1,
+ PROTOCOL_LPR_TYPE = 2
+ } spoolss_PortProtocol;
+
+ typedef [public] struct {
+ [charset(UTF16)] uint16 portname[64];
+ [value(0x00000001)] uint32 version;
+ spoolss_PortProtocol protocol;
+ [value(sizeof(r))] uint32 size;
+ uint32 reserved;
+ [charset(UTF16)] uint16 hostaddress[49];
+ [charset(UTF16)] uint16 snmpcommunity[33];
+ uint32 dblspool;
+ [charset(UTF16)] uint16 queue[33];
+ [charset(UTF16)] uint16 ip_address[16]; /* s3 had 17 */
+ [charset(UTF16)] uint16 hardware_address[13];
+ [charset(UTF16)] uint16 device_type[257];
+ uint32 port_number;
+ boolean32 snmp_enabled;
+ uint32 snmp_dev_index;
+ } spoolss_PortData1;
+
+ typedef [public] struct {
+ [string,charset(UTF16)] uint16 dll_name[];
+ } spoolss_MonitorUi;
+
WERROR spoolss_XcvData(
[in,ref] policy_handle *handle,
[in] [string,charset(UTF16)] uint16 function_name[],
--
Samba Shared Repository
More information about the samba-cvs
mailing list