[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue May 4 07:50:30 MDT 2010
The branch, master has been updated
via 1056a08... s4-smbtorture: add test_netprintdestgetinfo() to RAP-PRINTING.
via ff256b41.. s4-smbtorture: add smbcli_rap_netprintdestgetinfo().
via eee8033... s4-smbtorture: add test_netprintdestenum to RAP-PRINTING.
via ab1d9a9... rap: add rap_NetPrintDestGetInfo to IDL.
via 990361a... s4-smbtorture: add smbcli_rap_netprintdestenum.
via 5455e9d... rap: add IDL for (undocumented) NetPrintDestEnum.
from f4000ee... s3-idl: update the 2nd build_idl.sh script
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1056a081000b9bc3efb8040a7384042b2e2ea976
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:39:21 2010 +0200
s4-smbtorture: add test_netprintdestgetinfo() to RAP-PRINTING.
Guenther
commit ff256b41b81b4a22187abdfd2cf80e977eeb2a4a
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:29:53 2010 +0200
s4-smbtorture: add smbcli_rap_netprintdestgetinfo().
Guenther
commit eee803372ae948a578fdda668fb8a2fe3c195788
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:24:54 2010 +0200
s4-smbtorture: add test_netprintdestenum to RAP-PRINTING.
Guenther
commit ab1d9a923c0e6b5b2df56adad7c915edfbcbc15d
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:23:53 2010 +0200
rap: add rap_NetPrintDestGetInfo to IDL.
Guenther
commit 990361a38c789685708c75d50695100cfad059da
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:23:08 2010 +0200
s4-smbtorture: add smbcli_rap_netprintdestenum.
Guenther
commit 5455e9d77d9375a34a6e82b386fbceeb38a5233a
Author: Günther Deschner <gd at samba.org>
Date: Tue May 4 15:22:36 2010 +0200
rap: add IDL for (undocumented) NetPrintDestEnum.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/rap.idl | 70 +++++++++++++
source4/torture/rap/printing.c | 78 ++++++++++++++
source4/torture/rap/rap.c | 216 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 364 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/rap.idl b/librpc/idl/rap.idl
index 2265f70..5920496 100644
--- a/librpc/idl/rap.idl
+++ b/librpc/idl/rap.idl
@@ -676,6 +676,76 @@ interface rap
[out] uint16 convert
);
+ /* all not documented in MS-RAP */
+
+ typedef struct {
+ [charset(DOS)] uint8 PrintDestName[9];
+ } rap_PrintDest0;
+
+ typedef struct {
+ [charset(DOS)] uint8 PrintDestName[9];
+ [charset(DOS)] uint8 UserName[21];
+ uint16 JobId;
+ uint16 Status;
+ [relative_short] astring *StatusStringName;
+ uint16 PrintQueueNameHigh;
+ uint16 Time;
+ } rap_PrintDest1;
+
+ typedef struct {
+ [relative_short] astring *PrinterName;
+ uint16 PrinterNameHigh;
+ } rap_PrintDest2;
+
+ typedef struct {
+ [relative_short] astring *PrinterName;
+ uint16 PrinterNameHigh;
+ [relative_short] astring *UserName;
+ uint16 UserNameHigh;
+ [relative_short] astring *LogAddr;
+ uint16 LogAddrHigh;
+ uint16 JobId;
+ uint16 Status;
+ [relative_short] astring *StatusStringName;
+ uint16 PrintQueueNameHigh;
+ [relative_short] astring *Comment;
+ uint16 CommentHigh;
+ [relative_short] astring *Drivers;
+ uint16 DriversHigh;
+ uint16 Time;
+ uint16 Pad1;
+ } rap_PrintDest3;
+
+ typedef [public,nodiscriminant] union {
+ [case(0)] rap_PrintDest0 info0;
+ [case(1)] rap_PrintDest1 info1;
+ [case(2)] rap_PrintDest2 info2;
+ [case(3)] rap_PrintDest3 info3;
+ } rap_printdest_info;
+
+ /* not documented in MS-RAP */
+ [public] void rap_NetPrintDestEnum(
+ [in] uint16 level,
+ [in] uint16 bufsize,
+ [out] rap_status status,
+ [out] uint16 convert,
+ [out] uint16 count,
+ [out] uint16 available,
+ [out,switch_is(level)] rap_printdest_info info[count]
+ );
+
+ /* not documented in MS-RAP */
+ [public] void rap_NetPrintDestGetInfo(
+ [in] astring PrintDestName,
+ [in] uint16 level,
+ [in] uint16 bufsize,
+ [out] rap_status status,
+ [out] uint16 convert,
+ [out] uint16 available,
+ [out,switch_is(level)] rap_printdest_info info
+ );
+
+
/* Parameter description strings for RAP calls */
/* Names are defined name for RAP call with _REQ */
/* appended to end. */
diff --git a/source4/torture/rap/printing.c b/source4/torture/rap/printing.c
index b3119cf..72adb40 100644
--- a/source4/torture/rap/printing.c
+++ b/source4/torture/rap/printing.c
@@ -472,6 +472,82 @@ static bool test_netprintjobsetinfo(struct torture_context *tctx,
return true;
}
+static bool test_netprintdestenum(struct torture_context *tctx,
+ struct smbcli_state *cli)
+{
+ struct rap_NetPrintDestEnum r;
+ int i;
+ uint16_t levels[] = { 0, 1, 2, 3 };
+
+ for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+ r.in.level = levels[i];
+ r.in.bufsize = 8192;
+
+ torture_comment(tctx,
+ "Testing rap_NetPrintDestEnum level %d\n", r.in.level);
+
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netprintdestenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+ "smbcli_rap_netprintdestenum failed");
+ }
+
+ return true;
+}
+
+static bool test_netprintdestgetinfo_bydest(struct torture_context *tctx,
+ struct smbcli_state *cli,
+ const char *PrintDestName)
+{
+ struct rap_NetPrintDestGetInfo r;
+ int i;
+ uint16_t levels[] = { 0, 1, 2, 3 };
+
+ for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+ r.in.PrintDestName = PrintDestName;
+ r.in.level = levels[i];
+ r.in.bufsize = 8192;
+
+ torture_comment(tctx,
+ "Testing rap_NetPrintDestGetInfo(%s) level %d\n", r.in.PrintDestName, r.in.level);
+
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netprintdestgetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+ "smbcli_rap_netprintdestgetinfo failed");
+ }
+
+ return true;
+}
+
+
+static bool test_netprintdestgetinfo(struct torture_context *tctx,
+ struct smbcli_state *cli)
+{
+ struct rap_NetPrintDestEnum r;
+ int i;
+
+ r.in.level = 2;
+ r.in.bufsize = 8192;
+
+ torture_comment(tctx,
+ "Testing rap_NetPrintDestEnum level %d\n", r.in.level);
+
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netprintdestenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+ "smbcli_rap_netprintdestenum failed");
+
+ for (i=0; i < r.out.count; i++) {
+
+ torture_assert(tctx,
+ test_netprintdestgetinfo_bydest(tctx, cli, r.out.info[i].info2.PrinterName),
+ "failed to get printdest info");
+
+ }
+
+ return true;
+}
+
static bool test_rap_print(struct torture_context *tctx,
struct smbcli_state *cli)
{
@@ -499,6 +575,8 @@ struct torture_suite *torture_rap_printing(TALLOC_CTX *mem_ctx)
torture_suite_add_1smb_test(suite, "rap_printjob_getinfo", test_netprintjobgetinfo);
torture_suite_add_1smb_test(suite, "rap_printjob_setinfo", test_netprintjobsetinfo);
torture_suite_add_1smb_test(suite, "rap_printjob", test_netprintjob);
+ torture_suite_add_1smb_test(suite, "rap_printdest_enum", test_netprintdestenum);
+ torture_suite_add_1smb_test(suite, "rap_printdest_getinfo", test_netprintdestgetinfo);
return suite;
}
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 918b0ae..3e93b08 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1378,6 +1378,222 @@ NTSTATUS smbcli_rap_netprintjobsetinfo(struct smbcli_tree *tree,
return result;
}
+static NTSTATUS rap_pull_rap_PrintDest0(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintDest0 *r)
+{
+ NDR_RETURN(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintDestName, 9, sizeof(uint8_t), CH_DOS));
+
+ return NT_STATUS_OK;
+}
+
+static NTSTATUS rap_pull_rap_PrintDest1(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintDest1 *r)
+{
+ NDR_RETURN(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintDestName, 9, sizeof(uint8_t), CH_DOS));
+ NDR_RETURN(ndr_pull_charset(ndr, NDR_SCALARS, &r->UserName, 21, sizeof(uint8_t), CH_DOS));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->JobId));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Status));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->StatusStringName));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Time));
+
+ return NT_STATUS_OK;
+}
+
+static NTSTATUS rap_pull_rap_PrintDest2(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintDest2 *r)
+{
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->PrinterName));
+
+ return NT_STATUS_OK;
+}
+
+static NTSTATUS rap_pull_rap_PrintDest3(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintDest3 *r)
+{
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->PrinterName));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->UserName));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->LogAddr));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->JobId));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Status));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->StatusStringName));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->Comment));
+ RAP_RETURN(rap_pull_string(mem_ctx, ndr, convert, &r->Drivers));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Time));
+ NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Pad1));
+
+ return NT_STATUS_OK;
+
+}
+
+NTSTATUS smbcli_rap_netprintdestenum(struct smbcli_tree *tree,
+ struct smb_iconv_convenience *iconv_convenience,
+ TALLOC_CTX *mem_ctx,
+ struct rap_NetPrintDestEnum *r)
+{
+ struct rap_call *call;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ int i;
+
+ if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WPrintDestEnum))) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ rap_cli_push_word(call, r->in.level);
+ rap_cli_push_rcvbuf(call, r->in.bufsize);
+ rap_cli_expect_multiple_entries(call);
+
+ switch(r->in.level) {
+ case 0:
+ rap_cli_expect_format(call, "B9");
+ break;
+ case 1:
+ rap_cli_expect_format(call, "B9B21WWzW");
+ break;
+ case 2:
+ rap_cli_expect_format(call, "z");
+ break;
+ case 3:
+ rap_cli_expect_format(call, "zzzWWzzzWW");
+ break;
+ default:
+ result = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_NetPrintDestEnum, r);
+ }
+
+ result = rap_cli_do_call(tree, iconv_convenience, call);
+
+ if (!NT_STATUS_IS_OK(result))
+ goto done;
+
+ result = NT_STATUS_INVALID_PARAMETER;
+
+ NDR_GOTO(ndr_pull_rap_status(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
+
+ r->out.info = talloc_zero_array(mem_ctx, union rap_printdest_info, r->out.count);
+
+ if (r->out.info == NULL) {
+ result = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
+ result = NT_STATUS_OK;
+
+ for (i=0; i<r->out.count; i++) {
+ switch(r->in.level) {
+ case 0:
+ result = rap_pull_rap_PrintDest0(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info[i].info0);
+ break;
+ case 1:
+ result = rap_pull_rap_PrintDest1(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info[i].info1);
+ break;
+ case 2:
+ result = rap_pull_rap_PrintDest2(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info[i].info2);
+ break;
+ case 3:
+ result = rap_pull_rap_PrintDest3(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info[i].info3);
+ break;
+ }
+ }
+
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_NetPrintDestEnum, r);
+ }
+
+ result = NT_STATUS_OK;
+
+ done:
+ talloc_free(call);
+ return result;
+}
+
+NTSTATUS smbcli_rap_netprintdestgetinfo(struct smbcli_tree *tree,
+ struct smb_iconv_convenience *iconv_convenience,
+ TALLOC_CTX *mem_ctx,
+ struct rap_NetPrintDestGetInfo *r)
+{
+ struct rap_call *call;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ int i;
+
+ if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WPrintDestGetInfo))) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ rap_cli_push_string(call, r->in.PrintDestName);
+ rap_cli_push_word(call, r->in.level);
+ rap_cli_push_rcvbuf(call, r->in.bufsize);
+ rap_cli_expect_word(call);
+
+ switch(r->in.level) {
+ case 0:
+ rap_cli_expect_format(call, "B9");
+ break;
+ case 1:
+ rap_cli_expect_format(call, "B9B21WWzW");
+ break;
+ case 2:
+ rap_cli_expect_format(call, "z");
+ break;
+ case 3:
+ rap_cli_expect_format(call, "zzzWWzzzWW");
+ break;
+ default:
+ result = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_NetPrintDestGetInfo, r);
+ }
+
+ result = rap_cli_do_call(tree, iconv_convenience, call);
+
+ if (!NT_STATUS_IS_OK(result))
+ goto done;
+
+ result = NT_STATUS_INVALID_PARAMETER;
+
+ NDR_GOTO(ndr_pull_rap_status(call->ndr_pull_param, NDR_SCALARS, &r->out.status));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.convert));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
+
+ switch(r->in.level) {
+ case 0:
+ result = rap_pull_rap_PrintDest0(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info.info0);
+ break;
+ case 1:
+ result = rap_pull_rap_PrintDest1(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info.info1);
+ break;
+ case 2:
+ result = rap_pull_rap_PrintDest2(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info.info2);
+ break;
+ case 3:
+ result = rap_pull_rap_PrintDest3(mem_ctx, call->ndr_pull_data, r->out.convert, &r->out.info.info3);
+ break;
+ }
+
+ if (!NT_STATUS_IS_OK(result)) {
+ goto done;
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_NetPrintDestGetInfo, r);
+ }
+
+ result = NT_STATUS_OK;
+
+ done:
+ talloc_free(call);
+ return result;
+}
+
static bool test_netservergetinfo(struct torture_context *tctx,
struct smbcli_state *cli)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list