From 9d9fc4cfe7f058baaf7d251a4d468d72e681e62c Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 29 Apr 2010 19:21:40 +0200 Subject: s4-smbtorture: fix parsing of rap_pull_rap_PrintQueue1 and rap_pull_rap_PrintQueue2. Guenther --- source4/torture/rap/rap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 9e2307ce10..442f0a0b48 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -536,13 +536,14 @@ NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree, static NTSTATUS rap_pull_rap_PrintQueue0(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintQueue0 *r) { - NDR_RETURN(ndr_pull_bytes(ndr, r->PrintQName, 13)); + NDR_RETURN(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); + return NT_STATUS_OK; } static NTSTATUS rap_pull_rap_PrintQueue1(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, uint16_t convert, struct rap_PrintQueue1 *r) { - NDR_RETURN(ndr_pull_bytes(ndr, r->PrintQName, 13)); + NDR_RETURN(ndr_pull_charset(ndr, NDR_SCALARS, &r->PrintQName, 13, sizeof(uint8_t), CH_DOS)); NDR_RETURN(ndr_pull_uint8(ndr, NDR_SCALARS, &r->Pad1)); NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->Priority)); NDR_RETURN(ndr_pull_uint16(ndr, NDR_SCALARS, &r->StartTime)); -- cgit