[SCM] Samba Shared Repository - branch v3-4-test updated -
release-4-0-0alpha7-355-gaaf4c1d
Günther Deschner
gd at samba.org
Sat Mar 14 22:24:15 GMT 2009
The branch, v3-4-test has been updated
via aaf4c1ddf32e45d51e0fcd924b3cc2a863831567 (commit)
via e4a4940a9f5b9348676ae64bb674700b78d71b75 (commit)
via a34215a4c45231fd4de0a4b7ad6ce7378f653b69 (commit)
via 1497620da3234a58ef6121b22d3e85bb913c1f0e (commit)
via 435866a9cfdbefe7d7b693e12974b71b6e11e9ca (commit)
via bddf88947f7dd1920188c6cccb36b524b7a2006d (commit)
via f58fdec2b74cd4b68bb0c4ffb33b404356808ced (commit)
via 20fce06cf276e39c85230543eb4950a518b03e61 (commit)
via e163a1703ef48e1eed0c683a68332c6fbd64c512 (commit)
via 9bea8971210688231d64f0f23cb22828c32477b7 (commit)
via 33d0c7655b3623981abbb180099b84c56d59830a (commit)
via 5b18289814c37765d7f806e288c76c9bb2848e05 (commit)
via f81a2cb4f7008ddcf8bfd11bda94e16c7a010e2a (commit)
via c440644e8941cd167c5a8df1e4d203df0679944d (commit)
via b652a29969c8b745d9ef180e4b5018331731426f (commit)
via 3cc3e1744be7e4a0ac0057f23b5105fb33f41b2c (commit)
via b5bef45a9fc9f6bb90147acc0a3c593646f8059c (commit)
via d6750fc6f037971f3041e31bdfb02e4db475b63a (commit)
via 850f89a78b70d4242c3e816fb4455f9dfad34488 (commit)
via b5eb59d22e7eee0d00d16cdc9af8f9543d179c04 (commit)
via 6411893b9ef3cb6ab87d31e73627979353d64590 (commit)
via 3ee427d0b18a986ed063572c6a25f130aa0e0d7b (commit)
via 750470db4299e3b2d1f000e8d550cb5fdd4a762d (commit)
via 62da7201327af7f226358bf7678d784d9d3851c6 (commit)
via f8cc4649dda8fe926147b870963465b3cac6891b (commit)
via f1fe7a55c235bc69456a7c0ecc150b068c7ab580 (commit)
via 46824d45047080371364ff18a6c59c197dbf4c6f (commit)
via 5fc098b54aa6a60bd8f16a031dfd8a66364ccb70 (commit)
via 8594d1cc52437d941e9d0218edcb458a2ea1aba4 (commit)
via 705efd0cd779942da0c852fbb708891eb64a7a30 (commit)
via 83ba39772102c0193a0733701601f0e57265aead (commit)
via 949a8bbac8a3a79ce9bec10c2b69f817f506d3e9 (commit)
via 556bae68e5e579fb1ee596b030791c6b62667469 (commit)
via 38f4451244134aed3b133f32b26409dd7e492639 (commit)
via 23c82815eb33c82a856ac986fb648d3e9a83c951 (commit)
via 91f937359c8fd7bc66a2854dc8590aa5dd71c499 (commit)
via 50f43ca9e6aedfd8bf7fe4dbdd746c66aa082ec7 (commit)
via ad234c417479dcb4debaa5023adf614ced769a53 (commit)
via 47675d9c00b7f4ab30994416f725952330b41829 (commit)
via e9fdcdef0820dfe826627554be7b13fcb0f57943 (commit)
via e17609c956181f4681eb9a1da34743d22aa85edd (commit)
via a8d6f61d2496a507e9d30fc47f9edf4053a779fa (commit)
via df3bf36bd5060c1d63659f0f55fef51a34b8a58a (commit)
via 6944ce9fbd7e3e44849be9418c57b23b70cf5d67 (commit)
via 276b339492b994010861ef49299cd176a003b480 (commit)
via 74211ee9261750d4214d60331f1b856bfd8ba29e (commit)
from ec6b901d9fdea55660dc64c6f6bbfa5ef40f0678 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit aaf4c1ddf32e45d51e0fcd924b3cc2a863831567
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 12 13:00:24 2009 +0100
s3-spoolss: remove more unused marshalling code.
Guenther
(cherry picked from commit 7a41f299fc079290b17e64a8702cea8da332c227)
commit e4a4940a9f5b9348676ae64bb674700b78d71b75
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 12 12:50:20 2009 +0100
s3-spoolss: remove some unused functions.
Guenther
(cherry picked from commit 0068abe716c32fe02f9925bfdc8ab327d54bb4a7)
commit a34215a4c45231fd4de0a4b7ad6ce7378f653b69
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 12 11:01:18 2009 +0100
s3-spoolss: remove old spoolss_GetPrinter.
Guenther
(cherry picked from commit 348c4b6baa2efa5611215a9676ef8fd5e99fbdbd)
commit 1497620da3234a58ef6121b22d3e85bb913c1f0e
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 12 10:57:13 2009 +0100
s3-spoolss: use pidl for _spoolss_GetPrinter.
Guenther
(cherry picked from commit 1ceb298ed62be9a40d1e323003e1a9916d5688db)
commit 435866a9cfdbefe7d7b693e12974b71b6e11e9ca
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 11:52:34 2009 +0100
s3-rpcclient: pure cosmetics for cmd_spoolss_getdriver.
Guenther
(cherry picked from commit aaae578d0e5d555a55ea44a02c1a27a20ea314e2)
commit bddf88947f7dd1920188c6cccb36b524b7a2006d
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 11:52:04 2009 +0100
s3-rpcclient: pure cosmetics for cmd_spoolss_getprinter.
Guenther
(cherry picked from commit 5d76a12cf50872ce068cbd2b3b50f6690651aa50)
commit f58fdec2b74cd4b68bb0c4ffb33b404356808ced
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 11:48:58 2009 +0100
s3-rpcclient: pure cosmetics for cmd_spoolss_enum_ports.
Guenther
(cherry picked from commit 0658a402d7117b3daf6b100804e73a011e7ad62c)
commit 20fce06cf276e39c85230543eb4950a518b03e61
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 00:28:18 2009 +0100
s3-spoolss: use snum_is_shared_printer (allows to make code a little easier to
read).
Guenther
(cherry picked from commit 7e753b28ea6be2ceaef61c4377812a348b650955)
commit e163a1703ef48e1eed0c683a68332c6fbd64c512
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 00:27:54 2009 +0100
s3-spoolss: add snum_is_shared_printer fn.
Guenther
(cherry picked from commit 0174d4d3b2a682710ee4ab15c9af67910de53344)
commit 9bea8971210688231d64f0f23cb22828c32477b7
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 10 00:51:56 2009 +0100
s3-spoolss: remove old spoolss_EnumPrinters.
Guenther
(cherry picked from commit a1a02bfac2e29c9a8da945c767b9b3c5812730f7)
commit 33d0c7655b3623981abbb180099b84c56d59830a
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 10 00:51:38 2009 +0100
s3-spoolss: use pidl for _spoolss_EnumPrinters.
Guenther
(cherry picked from commit f6f703f16ef3b6a061801776e4bcc76fb04ad21a)
commit 5b18289814c37765d7f806e288c76c9bb2848e05
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 23:36:44 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit cdcc5a122b6e0ad32787ce0a9c9f02f90388aa4d)
commit f81a2cb4f7008ddcf8bfd11bda94e16c7a010e2a
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 23:36:11 2009 +0100
spoolss: flag PrinterInfo union and levels as [public,gensize].
Guenther
(cherry picked from commit d0902e29456f5e33fa585952ea4de9cf6589d4b7)
commit c440644e8941cd167c5a8df1e4d203df0679944d
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 22:48:13 2009 +0100
s3-spoolss: remove old enumprinters wrapper.
Guenther
(cherry picked from commit 16438e3a93e9f39d37b6144a1ccba80022bf0b07)
commit b652a29969c8b745d9ef180e4b5018331731426f
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 22:42:30 2009 +0100
s3-net: use rpccli_spoolss_enumprinters wrapper.
Guenther
(cherry picked from commit f14d4267c98a04384f8f84ac8567d3fb7b85ed75)
commit 3cc3e1744be7e4a0ac0057f23b5105fb33f41b2c
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 22:41:43 2009 +0100
s3-rpcclient: use rpccli_spoolss_enumprinters wrapper.
Guenther
(cherry picked from commit 0e66a244d3d616b45738424efda0865ca34998a3)
commit b5bef45a9fc9f6bb90147acc0a3c593646f8059c
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 22:00:47 2009 +0100
s3-spoolss: add rpccli_spoolss_enumprinters convenience wrapper.
Guenther
(cherry picked from commit 9397ae5114acf7e18144a9f700846ba7354a4be2)
commit d6750fc6f037971f3041e31bdfb02e4db475b63a
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 21:54:33 2009 +0100
s3-spoolss: remove old spoolss_GetPrinterDriver2.
Guenther
(cherry picked from commit 1b3e068e834fb5d99ca7ae9a1daa9fd401b886d5)
commit 850f89a78b70d4242c3e816fb4455f9dfad34488
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 21:21:15 2009 +0100
s3-spoolss: use pidl for _spoolss_GetPrinterDriver2.
Guenther
(cherry picked from commit 8df8abb8906e5d3bd26fa9f835c820a0c338d027)
commit b5eb59d22e7eee0d00d16cdc9af8f9543d179c04
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 18:25:52 2009 +0100
s3-spoolss: remove old leftover driver print functions.
Guenther
(cherry picked from commit 058f47d08d9ac121fdec9d230b366b5ff0488fce)
commit 6411893b9ef3cb6ab87d31e73627979353d64590
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 18:24:58 2009 +0100
s3-spoolss: remove old spoolss_EnumPrinterDrivers.
Guenther
(cherry picked from commit a540815b5f35ccf9c61cb04c803f76611d1c0f11)
commit 3ee427d0b18a986ed063572c6a25f130aa0e0d7b
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 18:23:40 2009 +0100
s3-spoolss: use pidl for _spoolss_EnumPrinterDrivers.
Guenther
(cherry picked from commit d6e2ef51ecb430d9dfd7221b6d4a030325d05b4f)
commit 750470db4299e3b2d1f000e8d550cb5fdd4a762d
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 00:41:25 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit fab10c6078ec584be543d7bdd62e5ca638811c20)
commit 62da7201327af7f226358bf7678d784d9d3851c6
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 00:40:56 2009 +0100
spoolss: add [gensize] flag to spoolss_DriverInfo union.
Guenther
(cherry picked from commit 86ed4dc89071f74d37cb195dbc9704596962e7f9)
commit f8cc4649dda8fe926147b870963465b3cac6891b
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 18:18:35 2009 +0100
s3-spoolss: remove old rpccli_spoolss_enumprinterdrivers wrapper.
Guenther
(cherry picked from commit 6928c5ce47e2ba37f844d030aa06f6b78c6ad64b)
commit f1fe7a55c235bc69456a7c0ecc150b068c7ab580
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 15:58:11 2009 +0100
s3-net: use rpccli_spoolss_enumprinterdrivers wrapper.
Guenther
(cherry picked from commit 7876d28d9a738768bfce6050d26d5f6c2668c28d)
commit 46824d45047080371364ff18a6c59c197dbf4c6f
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 15:00:29 2009 +0100
s3-rpcclient: use rpccli_spoolss_enumprinterdrivers wrapper.
Guenther
(cherry picked from commit 915c5939260cfa7c0000e18667f49de2a5f6c175)
commit 5fc098b54aa6a60bd8f16a031dfd8a66364ccb70
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 14:59:55 2009 +0100
s3-spoolss: add rpccli_spoolss_enumprinterdrivers convenience wrapper.
Guenther
(cherry picked from commit 5f465542286f2f6efb770e7ad385f07a46581326)
commit 8594d1cc52437d941e9d0218edcb458a2ea1aba4
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 12:33:18 2009 +0100
s3-spoolss: remove old spoolss_GetJob and spoolss_EnumJob.
Guenther
(cherry picked from commit e605e4503cbf60560a4022b7cb095e1c8cdad0f4)
commit 705efd0cd779942da0c852fbb708891eb64a7a30
Author: Günther Deschner <gd at samba.org>
Date: Mon Mar 9 12:24:45 2009 +0100
s3-spoolss: use pidl for _spoolss_GetJob.
Guenther
(cherry picked from commit 9b143e6de5c40a225c364b9377af52a8c7f6ca23)
commit 83ba39772102c0193a0733701601f0e57265aead
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 23:53:11 2009 +0100
s3-spoolss: use pidl for _spoolss_EnumJobs.
Guenther
(cherry picked from commit b80e3e572427eae881f38d9726f173952939a8a1)
commit 949a8bbac8a3a79ce9bec10c2b69f817f506d3e9
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 23:48:36 2009 +0100
s3-spoolss: add construct_dev_mode_new.
Guenther
(cherry picked from commit 661e81d48c5a2df40bba3b3e40ae432e14ffc4c3)
commit 556bae68e5e579fb1ee596b030791c6b62667469
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 22:33:33 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit fbfd22bce8ad7a56c12c56183f5b3d510817b821)
commit 38f4451244134aed3b133f32b26409dd7e492639
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 22:32:45 2009 +0100
spoolss: flag spoolss_JobInfo union and structures [public,gensize].
Guenther
(cherry picked from commit dfe90763c10a2c98847b74d23e42983ec00229bb)
commit 23c82815eb33c82a856ac986fb648d3e9a83c951
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 22:31:19 2009 +0100
s3-spoolss: remove old rpccli_spoolss_enumjobs wrapper.
Guenther
(cherry picked from commit 3bd1aabcfe02d411d30c2c62f18923368a4aba9c)
commit 91f937359c8fd7bc66a2854dc8590aa5dd71c499
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 22:28:06 2009 +0100
s3-rpcclient: use rpccli_spoolss_enumjobs wrapper in enumjobs command.
Guenther
(cherry picked from commit d279e76cd22e6028fd236c5eb38bf656ece6634a)
commit 50f43ca9e6aedfd8bf7fe4dbdd746c66aa082ec7
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 7 22:22:42 2009 +0100
s3-spoolss: add rpccli_spoolss_enumjobs convenience wrapper.
Guenther
(cherry picked from commit 80284124ba6eca1ef70216dc9b4b3e4276208300)
commit ad234c417479dcb4debaa5023adf614ced769a53
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 15:26:12 2009 +0100
s3-spoolss: use macros for _spoolss_GetForm and split out level 1 get.
Guenther
(cherry picked from commit 427987d2bfae5bd0a259f87ff00e0d1f0a6e8802)
commit 47675d9c00b7f4ab30994416f725952330b41829
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 02:16:29 2009 +0100
s3-spoolss: use macros for _spoolss_EnumForms and split out level 1 enum.
Guenther
(cherry picked from commit 635b8070b665473bf067ed71f7240b9707d3ca95)
commit e9fdcdef0820dfe826627554be7b13fcb0f57943
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 02:30:36 2009 +0100
s3-spoolss: use macros for _spoolss_GetPrintProcessorDirectory.
Guenther
(cherry picked from commit b2b3cfbe316d8bb082428f285cc8fb737e3dab87)
commit e17609c956181f4681eb9a1da34743d22aa85edd
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 02:30:12 2009 +0100
s3-spoolss: use macros for _spoolss_GetPrinterDriverDirectory.
Guenther
(cherry picked from commit 75d88f460fa9d3a15cc6b31a1c6fe3872512ce54)
commit a8d6f61d2496a507e9d30fc47f9edf4053a779fa
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 01:29:23 2009 +0100
s3-spoolss: use macros for _spoolss_EnumMonitors.
Guenther
(cherry picked from commit dfe71b05a7e4bd7de99b2e887b588875286ce245)
commit df3bf36bd5060c1d63659f0f55fef51a34b8a58a
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 01:44:21 2009 +0100
s3-spoolss: use macros for _spoolss_EnumPrintProcDataTypes.
Guenther
(cherry picked from commit 8d6c719a4b032cad746028338f3f263af819b8dd)
commit 6944ce9fbd7e3e44849be9418c57b23b70cf5d67
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 01:40:33 2009 +0100
s3-spoolss: use macros for _spoolss_EnumPorts.
Guenther
(cherry picked from commit c6e9dc11e5085baaf7365f72bc06684aeb8d89db)
commit 276b339492b994010861ef49299cd176a003b480
Author: Günther Deschner <gd at samba.org>
Date: Wed Mar 11 01:38:20 2009 +0100
s3-spoolss: use macros for _spoolss_EnumPrintProcessors.
Guenther
(cherry picked from commit facf66b40c6f8919bd78613990959a4f45a5738c)
commit 74211ee9261750d4214d60331f1b856bfd8ba29e
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 10 23:55:18 2009 +0100
s3-spoolss: add macros from s4 spoolss server.
Guenther
(cherry picked from commit 84b38c859899d1bffcabdd7cb846c6fe59ad5d3f)
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 123 +-
librpc/gen_ndr/ndr_spoolss.h | 39 +
librpc/gen_ndr/spoolss.h | 30 +-
librpc/idl/spoolss.idl | 30 +-
source3/include/proto.h | 114 +-
source3/include/rpc_spoolss.h | 409 -----
source3/rpc_client/cli_spoolss.c | 603 ++-----
source3/rpc_parse/parse_spoolss.c | 1597 ----------------
source3/rpc_server/srv_spoolss.c | 132 +--
source3/rpc_server/srv_spoolss_nt.c | 3398 ++++++++++++++++-------------------
source3/rpcclient/cmd_spoolss.c | 557 ++----
source3/utils/net_rpc_printer.c | 284 +---
12 files changed, 2135 insertions(+), 5181 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 3d1237c..8c8b687 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -304,7 +304,7 @@ _PUBLIC_ void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *nam
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -371,7 +371,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo0 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo0 *r)
{
uint32_t _ptr_printername;
TALLOC_CTX *_mem_save_printername_0;
@@ -512,6 +512,11 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo0(struct ndr_print *ndr, const char *
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo0(const struct spoolss_PrinterInfo0 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo0, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_DeviceModeFields(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
@@ -758,7 +763,7 @@ _PUBLIC_ void ndr_print_spoolss_EnumPrinterFlags(struct ndr_print *ndr, const ch
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -814,7 +819,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r)
{
uint32_t _ptr_name;
TALLOC_CTX *_mem_save_name_0;
@@ -938,6 +943,11 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo1(struct ndr_print *ndr, const char *
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo1(const struct spoolss_PrinterInfo1 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo1, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_PrinterAttributes(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
@@ -975,7 +985,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterAttributes(struct ndr_print *ndr, const c
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -1178,7 +1188,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo2 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo2 *r)
{
uint32_t _ptr_servername;
TALLOC_CTX *_mem_save_servername_0;
@@ -1656,7 +1666,12 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo2(struct ndr_print *ndr, const char *
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo3 *r)
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo2(const struct spoolss_PrinterInfo2 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo2, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo3 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -1676,7 +1691,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo3 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo3 *r)
{
uint32_t _ptr_secdesc;
TALLOC_CTX *_mem_save_secdesc_0;
@@ -1723,7 +1738,12 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo3(struct ndr_print *ndr, const char *
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo4 *r)
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo3(const struct spoolss_PrinterInfo3 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo3, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo4 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -1764,7 +1784,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo4 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo4 *r)
{
uint32_t _ptr_printername;
TALLOC_CTX *_mem_save_printername_0;
@@ -1853,7 +1873,12 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo4(struct ndr_print *ndr, const char *
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo5 *r)
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo4(const struct spoolss_PrinterInfo4 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo4, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo5 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -1896,7 +1921,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo5 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo5 *r)
{
uint32_t _ptr_printername;
TALLOC_CTX *_mem_save_printername_0;
@@ -1989,7 +2014,12 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo5(struct ndr_print *ndr, const char *
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo6(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo6 *r)
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo5(const struct spoolss_PrinterInfo5 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo5, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo6(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo6 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -2000,7 +2030,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo6(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo6(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo6 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo6(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo6 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
@@ -2019,6 +2049,11 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo6(struct ndr_print *ndr, const char *
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo6(const struct spoolss_PrinterInfo6 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo6, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_DsPrintAction(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
@@ -2045,7 +2080,7 @@ _PUBLIC_ void ndr_print_spoolss_DsPrintAction(struct ndr_print *ndr, const char
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo7 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo7 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -2071,7 +2106,7 @@ static enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_PrinterInfo7(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo7 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo7(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo7 *r)
{
uint32_t _ptr_guid;
TALLOC_CTX *_mem_save_guid_0;
@@ -2125,6 +2160,11 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo7(struct ndr_print *ndr, const char *
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo7(const struct spoolss_PrinterInfo7 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo7, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_DeviceModeInfo(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DeviceModeInfo *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -2490,6 +2530,11 @@ _PUBLIC_ void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *n
}
}
+_PUBLIC_ size_t ndr_size_spoolss_PrinterInfo(const union spoolss_PrinterInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_DevmodeContainer(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DevmodeContainer *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -2554,7 +2599,7 @@ _PUBLIC_ void ndr_print_spoolss_DevmodeContainer(struct ndr_print *ndr, const ch
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -2661,7 +2706,7 @@ static enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int ndr
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo1 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo1 *r)
{
uint32_t _ptr_printer_name;
TALLOC_CTX *_mem_save_printer_name_0;
@@ -2902,7 +2947,12 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo1(struct ndr_print *ndr, const char *name
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo2 *r)
+_PUBLIC_ size_t ndr_size_spoolss_JobInfo1(const struct spoolss_JobInfo1 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo1, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -3083,7 +3133,7 @@ static enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int ndr
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo2 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo2 *r)
{
uint32_t _ptr_printer_name;
TALLOC_CTX *_mem_save_printer_name_0;
@@ -3522,7 +3572,12 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo2(struct ndr_print *ndr, const char *name
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_JobInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo3 *r)
+_PUBLIC_ size_t ndr_size_spoolss_JobInfo2(const struct spoolss_JobInfo2 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo2, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo3 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -3535,7 +3590,7 @@ static enum ndr_err_code ndr_push_spoolss_JobInfo3(struct ndr_push *ndr, int ndr
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_JobInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo3 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo3 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
@@ -3558,7 +3613,12 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo3(struct ndr_print *ndr, const char *name
ndr->depth--;
}
-static enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo4 *r)
+_PUBLIC_ size_t ndr_size_spoolss_JobInfo3(const struct spoolss_JobInfo3 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo3, ic);
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo4 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -3740,7 +3800,7 @@ static enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int ndr
return NDR_ERR_SUCCESS;
}
-static enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo4 *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo4 *r)
{
uint32_t _ptr_printer_name;
TALLOC_CTX *_mem_save_printer_name_0;
@@ -4181,6 +4241,11 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo4(struct ndr_print *ndr, const char *name
ndr->depth--;
}
+_PUBLIC_ size_t ndr_size_spoolss_JobInfo4(const struct spoolss_JobInfo4 *r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo4, ic);
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_JobInfo *r)
{
uint32_t _save_relative_base_offset = ndr_push_get_relative_base_offset(ndr);
@@ -4335,6 +4400,11 @@ _PUBLIC_ void ndr_print_spoolss_JobInfo(struct ndr_print *ndr, const char *name,
}
}
+_PUBLIC_ size_t ndr_size_spoolss_JobInfo(const union spoolss_JobInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_JobInfo, ic);
+}
+
static enum ndr_err_code ndr_push_spoolss_SetJobInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_SetJobInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -13610,6 +13680,11 @@ _PUBLIC_ void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *na
}
}
+_PUBLIC_ size_t ndr_size_spoolss_DriverInfo(const union spoolss_DriverInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_union(r, flags, level, (ndr_push_flags_fn_t)ndr_push_spoolss_DriverInfo, ic);
+}
+
_PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverDirectoryInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DriverDirectoryInfo1 *r)
{
if (ndr_flags & NDR_SCALARS) {
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index c45b796..b6418f5 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -213,7 +213,10 @@ void ndr_print_spoolss_MajorVersion(struct ndr_print *ndr, const char *name, enu
void ndr_print_spoolss_MinorVersion(struct ndr_print *ndr, const char *name, enum spoolss_MinorVersion r);
void ndr_print_spoolss_PrinterStatus(struct ndr_print *ndr, const char *name, uint32_t r);
void ndr_print_spoolss_JobStatus(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo0 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo0 *r);
void ndr_print_spoolss_PrinterInfo0(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo0 *r);
+size_t ndr_size_spoolss_PrinterInfo0(const struct spoolss_PrinterInfo0 *r, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_DeviceModeFields(struct ndr_print *ndr, const char *name, uint32_t r);
enum ndr_err_code ndr_push_spoolss_DeviceMode(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DeviceMode *r);
enum ndr_err_code ndr_pull_spoolss_DeviceMode(struct ndr_pull *ndr, int ndr_flags, struct spoolss_DeviceMode *r);
@@ -222,27 +225,62 @@ size_t ndr_size_spoolss_DeviceMode(const struct spoolss_DeviceMode *r, struct sm
enum ndr_err_code ndr_push_spoolss_EnumPrinterFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r);
enum ndr_err_code ndr_pull_spoolss_EnumPrinterFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
void ndr_print_spoolss_EnumPrinterFlags(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo1 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo1 *r);
void ndr_print_spoolss_PrinterInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo1 *r);
+size_t ndr_size_spoolss_PrinterInfo1(const struct spoolss_PrinterInfo1 *r, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_PrinterAttributes(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo2 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo2 *r);
void ndr_print_spoolss_PrinterInfo2(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo2 *r);
+size_t ndr_size_spoolss_PrinterInfo2(const struct spoolss_PrinterInfo2 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo3 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo3 *r);
void ndr_print_spoolss_PrinterInfo3(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo3 *r);
+size_t ndr_size_spoolss_PrinterInfo3(const struct spoolss_PrinterInfo3 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo4 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo4 *r);
void ndr_print_spoolss_PrinterInfo4(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo4 *r);
+size_t ndr_size_spoolss_PrinterInfo4(const struct spoolss_PrinterInfo4 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo5 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo5 *r);
void ndr_print_spoolss_PrinterInfo5(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo5 *r);
+size_t ndr_size_spoolss_PrinterInfo5(const struct spoolss_PrinterInfo5 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo6(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo6 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo6(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo6 *r);
void ndr_print_spoolss_PrinterInfo6(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo6 *r);
+size_t ndr_size_spoolss_PrinterInfo6(const struct spoolss_PrinterInfo6 *r, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_DsPrintAction(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, int ndr_flags, const struct spoolss_PrinterInfo7 *r);
+enum ndr_err_code ndr_pull_spoolss_PrinterInfo7(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo7 *r);
void ndr_print_spoolss_PrinterInfo7(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo7 *r);
+size_t ndr_size_spoolss_PrinterInfo7(const struct spoolss_PrinterInfo7 *r, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_DeviceModeInfo(struct ndr_print *ndr, const char *name, const struct spoolss_DeviceModeInfo *r);
enum ndr_err_code ndr_push_spoolss_PrinterInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_PrinterInfo *r);
enum ndr_err_code ndr_pull_spoolss_PrinterInfo(struct ndr_pull *ndr, int ndr_flags, union spoolss_PrinterInfo *r);
void ndr_print_spoolss_PrinterInfo(struct ndr_print *ndr, const char *name, const union spoolss_PrinterInfo *r);
+size_t ndr_size_spoolss_PrinterInfo(const union spoolss_PrinterInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_DevmodeContainer(struct ndr_print *ndr, const char *name, const struct spoolss_DevmodeContainer *r);
+enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo1 *r);
+enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo1 *r);
void ndr_print_spoolss_JobInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_JobInfo1 *r);
+size_t ndr_size_spoolss_JobInfo1(const struct spoolss_JobInfo1 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo2 *r);
+enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo2 *r);
void ndr_print_spoolss_JobInfo2(struct ndr_print *ndr, const char *name, const struct spoolss_JobInfo2 *r);
+size_t ndr_size_spoolss_JobInfo2(const struct spoolss_JobInfo2 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_JobInfo3(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo3 *r);
+enum ndr_err_code ndr_pull_spoolss_JobInfo3(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo3 *r);
void ndr_print_spoolss_JobInfo3(struct ndr_print *ndr, const char *name, const struct spoolss_JobInfo3 *r);
+size_t ndr_size_spoolss_JobInfo3(const struct spoolss_JobInfo3 *r, struct smb_iconv_convenience *ic, int flags);
+enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int ndr_flags, const struct spoolss_JobInfo4 *r);
+enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int ndr_flags, struct spoolss_JobInfo4 *r);
void ndr_print_spoolss_JobInfo4(struct ndr_print *ndr, const char *name, const struct spoolss_JobInfo4 *r);
+size_t ndr_size_spoolss_JobInfo4(const struct spoolss_JobInfo4 *r, struct smb_iconv_convenience *ic, int flags);
enum ndr_err_code ndr_push_spoolss_JobInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_JobInfo *r);
enum ndr_err_code ndr_pull_spoolss_JobInfo(struct ndr_pull *ndr, int ndr_flags, union spoolss_JobInfo *r);
void ndr_print_spoolss_JobInfo(struct ndr_print *ndr, const char *name, const union spoolss_JobInfo *r);
+size_t ndr_size_spoolss_JobInfo(const union spoolss_JobInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags);
void ndr_print_spoolss_SetJobInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_SetJobInfo1 *r);
void ndr_print_spoolss_SetJobInfo2(struct ndr_print *ndr, const char *name, const struct spoolss_SetJobInfo2 *r);
void ndr_print_spoolss_SetJobInfo4(struct ndr_print *ndr, const char *name, const struct spoolss_SetJobInfo4 *r);
@@ -315,6 +353,7 @@ size_t ndr_size_spoolss_DriverInfo101(const struct spoolss_DriverInfo101 *r, str
enum ndr_err_code ndr_push_spoolss_DriverInfo(struct ndr_push *ndr, int ndr_flags, const union spoolss_DriverInfo *r);
enum ndr_err_code ndr_pull_spoolss_DriverInfo(struct ndr_pull *ndr, int ndr_flags, union spoolss_DriverInfo *r);
void ndr_print_spoolss_DriverInfo(struct ndr_print *ndr, const char *name, const union spoolss_DriverInfo *r);
+size_t ndr_size_spoolss_DriverInfo(const union spoolss_DriverInfo *r, uint32_t level, struct smb_iconv_convenience *ic, int flags);
enum ndr_err_code ndr_push_spoolss_DriverDirectoryInfo1(struct ndr_push *ndr, int ndr_flags, const struct spoolss_DriverDirectoryInfo1 *r);
enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo1(struct ndr_pull *ndr, int ndr_flags, struct spoolss_DriverDirectoryInfo1 *r);
void ndr_print_spoolss_DriverDirectoryInfo1(struct ndr_print *ndr, const char *name, const struct spoolss_DriverDirectoryInfo1 *r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 83a582e..77fb03a 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -193,7 +193,7 @@ struct spoolss_PrinterInfo0 {
uint32_t ref_ic;
uint32_t reserved2;
uint32_t reserved3;
-};
+}/* [gensize,public] */;
/* bitmap spoolss_DeviceModeFields */
#define DEVMODE_ORIENTATION ( 0x00000001 )
@@ -289,7 +289,7 @@ struct spoolss_PrinterInfo1 {
const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
/* bitmap spoolss_PrinterAttributes */
#define PRINTER_ATTRIBUTE_QUEUED ( 0x00000001 )
@@ -331,17 +331,17 @@ struct spoolss_PrinterInfo2 {
uint32_t status;
uint32_t cjobs;
uint32_t averageppm;
-};
+}/* [gensize,public] */;
struct spoolss_PrinterInfo3 {
struct security_descriptor *secdesc;/* [relative,subcontext(0)] */
-};
+}/* [gensize,public] */;
struct spoolss_PrinterInfo4 {
const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
uint32_t attributes;
-};
+}/* [gensize,public] */;
struct spoolss_PrinterInfo5 {
const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -349,11 +349,11 @@ struct spoolss_PrinterInfo5 {
uint32_t attributes;
uint32_t device_not_selected_timeout;
uint32_t transmission_retry_timeout;
-};
+}/* [gensize,public] */;
struct spoolss_PrinterInfo6 {
uint32_t status;
-};
+}/* [gensize,public] */;
/* bitmap spoolss_DsPrintAction */
#define DSPRINT_PUBLISH ( 0x00000001 )
@@ -365,7 +365,7 @@ struct spoolss_PrinterInfo6 {
struct spoolss_PrinterInfo7 {
const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
uint32_t action;
-};
+}/* [gensize,public] */;
--
Samba Shared Repository
More information about the samba-cvs
mailing list