summaryrefslogtreecommitdiff
path: root/source4/torture/rap
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-16 12:18:32 +0200
committerGünther Deschner <gd@samba.org>2010-06-16 12:18:32 +0200
commit185adc4c810eff3876727ed33b87c208aa09cb62 (patch)
tree451c96e04c38e2fcc6c8e3fb6ec6f194c7f6fa19 /source4/torture/rap
parentbd4bbd9bebc21da232d6a9ed53814eecda2163f3 (diff)
downloadsamba-185adc4c810eff3876727ed33b87c208aa09cb62.tar.gz
samba-185adc4c810eff3876727ed33b87c208aa09cb62.tar.bz2
samba-185adc4c810eff3876727ed33b87c208aa09cb62.zip
Revert "s4-smbtorture: only pull info when status code indicates success in smbcli_rap_netprintqgetinfo()."
This reverts commit 1f1c04010a55e67d8dc2110276eed4cf2a8a0afa.
Diffstat (limited to 'source4/torture/rap')
-rw-r--r--source4/torture/rap/rap.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 34036f0ae7..33d67156a3 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -719,12 +719,10 @@ NTSTATUS smbcli_rap_netprintqgetinfo(struct smbcli_tree *tree,
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));
- if (r->out.status == 0) {
- call->ndr_pull_data->relative_rap_convert = r->out.convert;
+ call->ndr_pull_data->relative_rap_convert = r->out.convert;
- NDR_GOTO(ndr_pull_set_switch_value(call->ndr_pull_data, &r->out.info, r->in.level));
- NDR_GOTO(ndr_pull_rap_printq_info(call->ndr_pull_data, NDR_SCALARS|NDR_BUFFERS, &r->out.info));
- }
+ NDR_GOTO(ndr_pull_set_switch_value(call->ndr_pull_data, &r->out.info, r->in.level));
+ NDR_GOTO(ndr_pull_rap_printq_info(call->ndr_pull_data, NDR_SCALARS|NDR_BUFFERS, &r->out.info));
if (DEBUGLEVEL >= 10) {
NDR_PRINT_OUT_DEBUG(rap_NetPrintQGetInfo, r);