The branch, master has been updated
via 727a1ac... s4-smbtorture: add extraformat to
smbcli_rap_netprintqgetinfo() as well.
via f181281... s4-smbtorture: use RAP extraformat for
smbcli_rap_netprintqenum().
via 99e3b9a... s4-smbtorture: add rap_cli_expect_extra_format().
from dda0ebd... s4-smbtorture: make all smbcli_rap_* failures critical.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 727a1acd917baa1d8a5490569782ca41b7136215
Author: Günther Deschner <[email protected]>
Date: Mon May 3 20:23:45 2010 +0200
s4-smbtorture: add extraformat to smbcli_rap_netprintqgetinfo() as well.
Guenther
commit f181281c89a395f4efbcee7f984e13faa69df749
Author: Günther Deschner <[email protected]>
Date: Mon May 3 20:02:37 2010 +0200
s4-smbtorture: use RAP extraformat for smbcli_rap_netprintqenum().
Although w2k3 happily ignores it, the spec (and s3) enforce the addition of
that.
Guenther
commit 99e3b9a3672d4d847aea5e1ca446f543f810c84c
Author: Günther Deschner <[email protected]>
Date: Thu Apr 29 20:04:12 2010 +0200
s4-smbtorture: add rap_cli_expect_extra_format().
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rap/rap.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 0542379..918b0ae 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -67,6 +67,7 @@ struct rap_call {
uint16_t callno;
char *paramdesc;
const char *datadesc;
+ const char *auxdatadesc;
uint16_t status;
uint16_t convert;
@@ -95,6 +96,7 @@ static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx,
struct smb_iconv_c
call->paramdesc = NULL;
call->datadesc = NULL;
+ call->auxdatadesc = NULL;
call->ndr_push_param = ndr_push_init_ctx(mem_ctx, iconv_convenience);
call->ndr_push_param->flags = RAPNDR_FLAGS;
@@ -183,6 +185,11 @@ static void rap_cli_expect_format(struct rap_call *call,
const char *format)
call->datadesc = format;
}
+static void rap_cli_expect_extra_format(struct rap_call *call, const char
*format)
+{
+ call->auxdatadesc = format;
+}
+
static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
uint16_t convert, const char **dest)
{
@@ -246,6 +253,9 @@ static NTSTATUS rap_cli_do_call(struct smbcli_tree *tree,
NDR_RETURN(ndr_push_bytes(params, param_blob.data,
param_blob.length));
+ if (call->auxdatadesc)
+ NDR_RETURN(ndr_push_string(params, NDR_SCALARS,
call->auxdatadesc));
+
trans.in.params = ndr_push_blob(params);
trans.in.data = data_blob(NULL, 0);
@@ -721,12 +731,15 @@ NTSTATUS smbcli_rap_netprintqenum(struct smbcli_tree
*tree,
break;
case 2:
rap_cli_expect_format(call, "B13BWWWzzzzzWN");
+ rap_cli_expect_extra_format(call, "WB21BB16B10zWWzDDz");
break;
case 3:
rap_cli_expect_format(call, "zWWWWzzzzWWzzl");
break;
case 4:
rap_cli_expect_format(call, "zWWWWzzzzWNzzl");
+ rap_cli_expect_extra_format(call, "WWzWWDDzz");
+ /* no mention of extra format in MS-RAP */
break;
case 5:
rap_cli_expect_format(call, "z");
@@ -823,12 +836,15 @@ NTSTATUS smbcli_rap_netprintqgetinfo(struct smbcli_tree
*tree,
break;
case 2:
rap_cli_expect_format(call, "B13BWWWzzzzzWN");
+ rap_cli_expect_extra_format(call, "WB21BB16B10zWWzDDz");
break;
case 3:
rap_cli_expect_format(call, "zWWWWzzzzWWzzl");
break;
case 4:
rap_cli_expect_format(call, "zWWWWzzzzWNzzl");
+ rap_cli_expect_extra_format(call, "WWzWWDDzz");
+ /* no mention of extra format in MS-RAP */
break;
case 5:
rap_cli_expect_format(call, "z");
--
Samba Shared Repository
