The branch, master has been updated
via 52b669b... s4-smbtorture: pause and resume printq in RAP-PRINTING
test.
via af24829... s4-smbtorture: use rap_status in smbcli_rap_* functions.
via 4da66a3... s3: re-run make samba3-idl.
via fc9c004... rap: use rap_status in IDL.
via 3bfceaf... rap: add rap_status to IDL.
via 7cdd6a1... s4-smbtorture: add smbcli_rap_netprintqueueresume() and
smbcli_rap_netprintqueuepurge().
via 2df2cef... s4-smbtorture: add test_netprintq to RAP-PRINTING.
via 7f1775e... s4-smbtorture: add smbcli_rap_netprintqueuepause().
via 3b3e197... s3: re-run make samba3-idl.
via 1cdb1a9... rap: add IDL for rap_NetPrintQueue{Pause,Continue,Purge}.
from 0f57a39... pidl: Fix display field for time fields with newer
versions of Wireshark.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 52b669b68e7de2ffa2b55ebfde90f9419f3b068b
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:38:49 2010 +0200
s4-smbtorture: pause and resume printq in RAP-PRINTING test.
Guenther
commit af2482989b3a55e7d0836a12b4464de98d541d0f
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:36:59 2010 +0200
s4-smbtorture: use rap_status in smbcli_rap_* functions.
Guenther
commit 4da66a36451a4f469f577a916cf869c7bc31ecd2
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:42:02 2010 +0200
s3: re-run make samba3-idl.
Guenther
commit fc9c004e7d7bdf552de0ab584179a416bb23ec5e
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:38:04 2010 +0200
rap: use rap_status in IDL.
Guenther
commit 3bfceafed7ad33d7bdf4cf9391f71b57dbe54220
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:35:41 2010 +0200
rap: add rap_status to IDL.
Guenther
commit 7cdd6a15afb58b05f524ec859776ee02a41cf582
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 13:34:20 2010 +0200
s4-smbtorture: add smbcli_rap_netprintqueueresume() and
smbcli_rap_netprintqueuepurge().
Guenther
commit 2df2cef437d19d2cb7675aa8297eaa24a8706bee
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 11:57:40 2010 +0200
s4-smbtorture: add test_netprintq to RAP-PRINTING.
Guenther
commit 7f1775e8604b405d89b578b0f04081c8273c7217
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 11:57:14 2010 +0200
s4-smbtorture: add smbcli_rap_netprintqueuepause().
Guenther
commit 3b3e19724cf178c916c6868c82f097000b79a1e2
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 11:56:47 2010 +0200
s3: re-run make samba3-idl.
Guenther
commit 1cdb1a9df61274adaee90a32a7376635c29fc689
Author: Günther Deschner <[email protected]>
Date: Fri Apr 30 11:55:18 2010 +0200
rap: add IDL for rap_NetPrintQueue{Pause,Continue,Purge}.
it seems like they are not documented (at least not in MS-RAP).
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_rap.c | 239 ++++++++++++++++++++++++++++++++++++----
librpc/gen_ndr/ndr_rap.h | 20 +++-
librpc/gen_ndr/rap.h | 66 ++++++++++--
librpc/idl/rap.idl | 41 ++++++--
librpc/ndr/ndr_rap.c | 4 +
librpc/ndr/ndr_rap.h | 1 +
source4/torture/rap/printing.c | 64 +++++++++++
source4/torture/rap/rap.c | 127 ++++++++++++++++++++--
8 files changed, 513 insertions(+), 49 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_rap.c b/librpc/gen_ndr/ndr_rap.c
index 52cd610..43e7691 100644
--- a/librpc/gen_ndr/ndr_rap.c
+++ b/librpc/gen_ndr/ndr_rap.c
@@ -3,6 +3,20 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_rap.h"
+_PUBLIC_ enum ndr_err_code ndr_push_rap_status(struct ndr_push *ndr, int
ndr_flags, enum rap_status r)
+{
+ NDR_CHECK(ndr_push_enum_uint1632(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_rap_status(struct ndr_pull *ndr, int
ndr_flags, enum rap_status *r)
+{
+ uint16_t v;
+ NDR_CHECK(ndr_pull_enum_uint1632(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
static enum ndr_err_code ndr_push_rap_share_info_0(struct ndr_push *ndr, int
ndr_flags, const struct rap_share_info_0 *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -2239,7 +2253,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetShareEnum(struct ndr_push *ndr, int f
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2264,7 +2278,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetShareEnum(struct ndr_pull *ndr, int f
ZERO_STRUCTP(r->out.info);
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2297,7 +2311,7 @@ _PUBLIC_ void ndr_print_rap_NetShareEnum(struct ndr_print
*ndr, const char *name
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetShareEnum");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr_print_uint16(ndr, "count", r->out.count);
ndr_print_uint16(ndr, "available", r->out.available);
@@ -2329,7 +2343,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetServerEnum2(struct ndr_push *ndr, int
}
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2362,7 +2376,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetServerEnum2(struct ndr_pull *ndr, int
}
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2404,7 +2418,7 @@ _PUBLIC_ void ndr_print_rap_NetServerEnum2(struct
ndr_print *ndr, const char *na
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetServerEnum2");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr_print_uint16(ndr, "count", r->out.count);
ndr_print_uint16(ndr, "available", r->out.available);
@@ -2431,7 +2445,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_WserverGetInfo(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
NDR_CHECK(ndr_push_set_switch_value(ndr, &r->out.info,
r->in.level));
@@ -2449,7 +2463,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_WserverGetInfo(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->out.info,
r->in.level));
@@ -2475,7 +2489,7 @@ _PUBLIC_ void ndr_print_rap_WserverGetInfo(struct
ndr_print *ndr, const char *na
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_WserverGetInfo");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr_print_uint16(ndr, "available", r->out.available);
ndr_print_set_switch_value(ndr, &r->out.info, r->in.level);
@@ -2493,7 +2507,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetPrintQEnum(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.count));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
@@ -2519,7 +2533,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetPrintQEnum(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.count));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
@@ -2556,7 +2570,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQEnum(struct
ndr_print *ndr, const char *nam
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetPrintQEnum");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr_print_uint16(ndr, "count", r->out.count);
ndr_print_uint16(ndr, "available", r->out.available);
@@ -2589,7 +2603,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetPrintQGetInfo(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.available));
NDR_CHECK(ndr_push_set_switch_value(ndr, &r->out.info,
r->in.level));
@@ -2613,7 +2627,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetPrintQGetInfo(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.bufsize));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.available));
NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->out.info,
r->in.level));
@@ -2640,7 +2654,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintQGetInfo(struct
ndr_print *ndr, const char *
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetPrintQGetInfo");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr_print_uint16(ndr, "available", r->out.available);
ndr_print_set_switch_value(ndr, &r->out.info, r->in.level);
@@ -2656,7 +2670,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetPrintJobPause(struct ndr_push *ndr, i
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2670,7 +2684,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetPrintJobPause(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2692,7 +2706,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobPause(struct
ndr_print *ndr, const char *
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetPrintJobPause");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr->depth--;
}
@@ -2705,7 +2719,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetPrintJobContinue(struct ndr_push *ndr
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2719,7 +2733,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetPrintJobContinue(struct ndr_pull *ndr
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2741,7 +2755,7 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobContinue(struct
ndr_print *ndr, const cha
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetPrintJobContinue");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr->depth--;
}
@@ -2754,7 +2768,7 @@ _PUBLIC_ enum ndr_err_code
ndr_push_rap_NetPrintJobDelete(struct ndr_push *ndr,
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2768,7 +2782,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_rap_NetPrintJobDelete(struct ndr_pull *ndr,
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->in.JobID));
}
if (flags & NDR_OUT) {
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.status));
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
}
return NDR_ERR_SUCCESS;
@@ -2790,7 +2804,184 @@ _PUBLIC_ void ndr_print_rap_NetPrintJobDelete(struct
ndr_print *ndr, const char
if (flags & NDR_OUT) {
ndr_print_struct(ndr, "out", "rap_NetPrintJobDelete");
ndr->depth++;
- ndr_print_uint16(ndr, "status", r->out.status);
+ ndr_print_rap_status(ndr, "status", r->out.status);
+ ndr_print_uint16(ndr, "convert", r->out.convert);
+ ndr->depth--;
+ }
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueuePause(struct ndr_push
*ndr, int flags, const struct rap_NetPrintQueuePause *r)
+{
+ if (flags & NDR_IN) {
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueuePause(struct ndr_pull
*ndr, int flags, struct rap_NetPrintQueuePause *r)
+{
+ if (flags & NDR_IN) {
+ ZERO_STRUCT(r->out);
+
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_rap_NetPrintQueuePause(struct ndr_print *ndr, const
char *name, int flags, const struct rap_NetPrintQueuePause *r)
+{
+ ndr_print_struct(ndr, name, "rap_NetPrintQueuePause");
+ ndr->depth++;
+ if (flags & NDR_SET_VALUES) {
+ ndr->flags |= LIBNDR_PRINT_SET_VALUES;
+ }
+ if (flags & NDR_IN) {
+ ndr_print_struct(ndr, "in", "rap_NetPrintQueuePause");
+ ndr->depth++;
+ ndr_print_string(ndr, "PrintQueueName", r->in.PrintQueueName);
+ ndr->depth--;
+ }
+ if (flags & NDR_OUT) {
+ ndr_print_struct(ndr, "out", "rap_NetPrintQueuePause");
+ ndr->depth++;
+ ndr_print_rap_status(ndr, "status", r->out.status);
+ ndr_print_uint16(ndr, "convert", r->out.convert);
+ ndr->depth--;
+ }
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueueResume(struct ndr_push
*ndr, int flags, const struct rap_NetPrintQueueResume *r)
+{
+ if (flags & NDR_IN) {
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueueResume(struct ndr_pull
*ndr, int flags, struct rap_NetPrintQueueResume *r)
+{
+ if (flags & NDR_IN) {
+ ZERO_STRUCT(r->out);
+
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_rap_NetPrintQueueResume(struct ndr_print *ndr, const
char *name, int flags, const struct rap_NetPrintQueueResume *r)
+{
+ ndr_print_struct(ndr, name, "rap_NetPrintQueueResume");
+ ndr->depth++;
+ if (flags & NDR_SET_VALUES) {
+ ndr->flags |= LIBNDR_PRINT_SET_VALUES;
+ }
+ if (flags & NDR_IN) {
+ ndr_print_struct(ndr, "in", "rap_NetPrintQueueResume");
+ ndr->depth++;
+ ndr_print_string(ndr, "PrintQueueName", r->in.PrintQueueName);
+ ndr->depth--;
+ }
+ if (flags & NDR_OUT) {
+ ndr_print_struct(ndr, "out", "rap_NetPrintQueueResume");
+ ndr->depth++;
+ ndr_print_rap_status(ndr, "status", r->out.status);
+ ndr_print_uint16(ndr, "convert", r->out.convert);
+ ndr->depth--;
+ }
+ ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_rap_NetPrintQueuePurge(struct ndr_push
*ndr, int flags, const struct rap_NetPrintQueuePurge *r)
+{
+ if (flags & NDR_IN) {
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_push_rap_status(ndr, NDR_SCALARS, r->out.status));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_rap_NetPrintQueuePurge(struct ndr_pull
*ndr, int flags, struct rap_NetPrintQueuePurge *r)
+{
+ if (flags & NDR_IN) {
+ ZERO_STRUCT(r->out);
+
+ {
+ 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->in.PrintQueueName));
+ ndr->flags = _flags_save_string;
+ }
+ }
+ if (flags & NDR_OUT) {
+ NDR_CHECK(ndr_pull_rap_status(ndr, NDR_SCALARS,
&r->out.status));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->out.convert));
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_rap_NetPrintQueuePurge(struct ndr_print *ndr, const
char *name, int flags, const struct rap_NetPrintQueuePurge *r)
+{
+ ndr_print_struct(ndr, name, "rap_NetPrintQueuePurge");
+ ndr->depth++;
+ if (flags & NDR_SET_VALUES) {
+ ndr->flags |= LIBNDR_PRINT_SET_VALUES;
+ }
+ if (flags & NDR_IN) {
+ ndr_print_struct(ndr, "in", "rap_NetPrintQueuePurge");
+ ndr->depth++;
+ ndr_print_string(ndr, "PrintQueueName", r->in.PrintQueueName);
+ ndr->depth--;
+ }
+ if (flags & NDR_OUT) {
+ ndr_print_struct(ndr, "out", "rap_NetPrintQueuePurge");
+ ndr->depth++;
+ ndr_print_rap_status(ndr, "status", r->out.status);
ndr_print_uint16(ndr, "convert", r->out.convert);
ndr->depth--;
}
diff --git a/librpc/gen_ndr/ndr_rap.h b/librpc/gen_ndr/ndr_rap.h
index 3638ab7..60c8f46 100644
--- a/librpc/gen_ndr/ndr_rap.h
+++ b/librpc/gen_ndr/ndr_rap.h
@@ -23,7 +23,16 @@
#define NDR_RAP_NETPRINTJOBDELETE (0x07)
-#define NDR_RAP_CALL_COUNT (8)
+#define NDR_RAP_NETPRINTQUEUEPAUSE (0x08)
+
+#define NDR_RAP_NETPRINTQUEUERESUME (0x09)
+
+#define NDR_RAP_NETPRINTQUEUEPURGE (0x0a)
+
+#define NDR_RAP_CALL_COUNT (11)
+enum ndr_err_code ndr_push_rap_status(struct ndr_push *ndr, int ndr_flags,
enum rap_status r);
+enum ndr_err_code ndr_pull_rap_status(struct ndr_pull *ndr, int ndr_flags,
enum rap_status *r);
+void ndr_print_rap_status(struct ndr_print *ndr, const char *name, enum
rap_status r);
void ndr_print_rap_share_info_0(struct ndr_print *ndr, const char *name, const
struct rap_share_info_0 *r);
void ndr_print_rap_share_info_1(struct ndr_print *ndr, const char *name, const
struct rap_share_info_1 *r);
void ndr_print_rap_share_info_2(struct ndr_print *ndr, const char *name, const
struct rap_share_info_2 *r);
@@ -74,4 +83,13 @@ void ndr_print_rap_NetPrintJobContinue(struct ndr_print
*ndr, const char *name,
enum ndr_err_code ndr_push_rap_NetPrintJobDelete(struct ndr_push *ndr, int
flags, const struct rap_NetPrintJobDelete *r);
enum ndr_err_code ndr_pull_rap_NetPrintJobDelete(struct ndr_pull *ndr, int
flags, struct rap_NetPrintJobDelete *r);
void ndr_print_rap_NetPrintJobDelete(struct ndr_print *ndr, const char *name,
int flags, const struct rap_NetPrintJobDelete *r);
+enum ndr_err_code ndr_push_rap_NetPrintQueuePause(struct ndr_push *ndr, int
flags, const struct rap_NetPrintQueuePause *r);
+enum ndr_err_code ndr_pull_rap_NetPrintQueuePause(struct ndr_pull *ndr, int
flags, struct rap_NetPrintQueuePause *r);
+void ndr_print_rap_NetPrintQueuePause(struct ndr_print *ndr, const char *name,
int flags, const struct rap_NetPrintQueuePause *r);
+enum ndr_err_code ndr_push_rap_NetPrintQueueResume(struct ndr_push *ndr, int
flags, const struct rap_NetPrintQueueResume *r);
+enum ndr_err_code ndr_pull_rap_NetPrintQueueResume(struct ndr_pull *ndr, int
flags, struct rap_NetPrintQueueResume *r);
+void ndr_print_rap_NetPrintQueueResume(struct ndr_print *ndr, const char
*name, int flags, const struct rap_NetPrintQueueResume *r);
+enum ndr_err_code ndr_push_rap_NetPrintQueuePurge(struct ndr_push *ndr, int
flags, const struct rap_NetPrintQueuePurge *r);
+enum ndr_err_code ndr_pull_rap_NetPrintQueuePurge(struct ndr_pull *ndr, int
flags, struct rap_NetPrintQueuePurge *r);
+void ndr_print_rap_NetPrintQueuePurge(struct ndr_print *ndr, const char *name,
int flags, const struct rap_NetPrintQueuePurge *r);
#endif /* _HEADER_NDR_rap */
diff --git a/librpc/gen_ndr/rap.h b/librpc/gen_ndr/rap.h
index 63c990e..2b7adc6 100644
--- a/librpc/gen_ndr/rap.h
+++ b/librpc/gen_ndr/rap.h
@@ -338,6 +338,17 @@
#define RAP_USER_LOGOFF_INFO_L1 ( "WDW" )
#define RAP_WKSTA_INFO_L1 ( "WDzzzzBBDWDWWWWWWWWWWWWWWWWWWWzzWzzW" )
#define RAP_WKSTA_INFO_L10 ( "zzzBBzz" )
+enum rap_status
+#ifndef USE_UINT_ENUMS
+ {
+ NERR_Success=(int)(0)
+}
+#else
+ { __donnot_use_enum_rap_status=0x7FFFFFFF}
+#define NERR_Success ( 0 )
+#endif
+;
+
struct rap_group_info_1 {
uint8_t group_name[21];
uint8_t reserved1;
@@ -600,7 +611,7 @@ struct rap_NetShareEnum {
} in;
struct {
- uint16_t status;
+ enum rap_status status;
uint16_t convert;
uint16_t count;
uint16_t available;
@@ -619,7 +630,7 @@ struct rap_NetServerEnum2 {
} in;
struct {
- uint16_t status;
+ enum rap_status status;
uint16_t convert;
uint16_t count;
uint16_t available;
@@ -636,7 +647,7 @@ struct rap_WserverGetInfo {
} in;
struct {
- uint16_t status;
+ enum rap_status status;
--
Samba Shared Repository
