s4-smbtorture: fix parsing of rap_pull_rap_PrintQueue1 and rap_pull_rap_PrintQueue2.
authorGünther Deschner <gd@samba.org>
Thu, 29 Apr 2010 17:21:40 +0000 (19:21 +0200)
committerGünther Deschner <gd@samba.org>
Thu, 29 Apr 2010 23:25:08 +0000 (01:25 +0200)
Guenther

source4/torture/rap/rap.c

index 9e2307ce10728d757bd93476e3344316ae776e8a..442f0a0b486bc9a11c779f53d9741909172491ae 100644 (file)
@@ -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));