#include "libcli/libcli.h"
#include "torture/smbtorture.h"
#include "torture/util.h"
-#include "libcli/rap/rap.h"
-#include "libcli/raw/libcliraw.h"
-#include "libcli/libcli.h"
+#include "../librpc/gen_ndr/ndr_rap.h"
#include "librpc/ndr/libndr.h"
#include "param/param.h"
+#include "torture/rap/proto.h"
#define RAP_GOTO(call) do { \
NTSTATUS _status; \
}
static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
- uint16_t convert, char **dest)
+ uint16_t convert, const char **dest)
{
uint16_t string_offset;
uint16_t ignore;
return NT_STATUS_INVALID_PARAMETER;
*dest = talloc_zero_array(mem_ctx, char, len+1);
- pull_string(ndr->iconv_convenience, *dest, p, len+1, len, STR_ASCII);
+ pull_string((char *)*dest, p, len+1, len, STR_ASCII);
return NT_STATUS_OK;
}
params->flags = RAPNDR_FLAGS;
trans.in.max_param = call->rcv_paramlen;
- trans.in.max_data = smb_raw_max_trans_data(tree, call->rcv_paramlen);
+ trans.in.max_data = call->rcv_datalen;
trans.in.max_setup = 0;
trans.in.flags = 0;
trans.in.timeout = 0;
break;
}
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_NetShareEnum, r);
+ }
+
result = rap_cli_do_call(tree, iconv_convenience, call);
if (!NT_STATUS_IS_OK(result))
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_array(mem_ctx, union rap_shareenum_info, r->out.count);
+ r->out.info = talloc_array(mem_ctx, union rap_share_info, r->out.count);
if (r->out.info == NULL) {
result = NT_STATUS_NO_MEMORY;
switch(r->in.level) {
case 0:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info0.name, 13));
+ r->out.info[i].info0.share_name, 13));
break;
case 1:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info1.name, 13));
+ r->out.info[i].info1.share_name, 13));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)&r->out.info[i].info1.pad, 1));
+ &r->out.info[i].info1.reserved1, 1));
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
- NDR_SCALARS, &r->out.info[i].info1.type));
+ NDR_SCALARS, &r->out.info[i].info1.share_type));
RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
r->out.convert,
&r->out.info[i].info1.comment));
}
}
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_NetShareEnum, r);
+ }
result = NT_STATUS_OK;
done:
smbcli_rap_netshareenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
for (i=0; i<r.out.count; i++) {
- printf("%s %d %s\n", r.out.info[i].info1.name,
- r.out.info[i].info1.type,
+ printf("%s %d %s\n", r.out.info[i].info1.share_name,
+ r.out.info[i].info1.share_type,
r.out.info[i].info1.comment);
}
break;
}
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_NetServerEnum2, r);
+ }
+
result = rap_cli_do_call(tree, iconv_convenience, call);
if (!NT_STATUS_IS_OK(result))
switch(r->in.level) {
case 0:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info0.name, 16));
+ r->out.info[i].info0.name, 16));
break;
case 1:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info1.name, 16));
+ r->out.info[i].info1.name, 16));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
&r->out.info[i].info1.version_major, 1));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
}
}
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_NetServerEnum2, r);
+ }
+
result = NT_STATUS_OK;
done:
goto done;
}
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_WserverGetInfo, r);
+ }
+
result = rap_cli_do_call(tree, iconv_convenience, call);
if (!NT_STATUS_IS_OK(result))
switch(r->in.level) {
case 0:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info.info0.name, 16));
+ r->out.info.info0.name, 16));
break;
case 1:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info.info1.name, 16));
+ r->out.info.info1.name, 16));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
&r->out.info.info1.version_major, 1));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
r->out.convert,
&r->out.info.info1.comment));
}
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_WserverGetInfo, r);
+ }
+ done:
+ talloc_free(call);
+ return result;
+}
+
+NTSTATUS smbcli_rap_netprintqenum(struct smbcli_tree *tree,
+ struct smb_iconv_convenience *iconv_convenience,
+ TALLOC_CTX *mem_ctx,
+ struct rap_NetPrintQEnum *r)
+{
+ struct rap_call *call;
+ NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+ int i;
+
+ if (!(call = new_rap_cli_call(mem_ctx, iconv_convenience, RAP_WPrintQEnum))) {
+ 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, "B13");
+ break;
+ case 1:
+ rap_cli_expect_format(call, "B13BWWWzzzzzWW");
+ break;
+ case 2:
+ rap_cli_expect_format(call, "B13BWWWzzzzzWN");
+ break;
+ case 3:
+ rap_cli_expect_format(call, "zWWWWzzzzWWzzl");
+ break;
+ case 4:
+ rap_cli_expect_format(call, "zWWWWzzzzWNzzl");
+ break;
+ case 5:
+ rap_cli_expect_format(call, "z");
+ break;
+ default:
+ result = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_IN_DEBUG(rap_NetPrintQEnum, 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_uint16(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_array(mem_ctx, union rap_printq_info, r->out.count);
+
+ if (r->out.info == NULL) {
+ result = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
+ for (i=0; i<r->out.count; i++) {
+ switch(r->in.level) {
+ case 0:
+ NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+ r->out.info[i].info0.PrintQName, 13));
+ break;
+ case 1:
+ NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
+ r->out.info[i].info1.PrintQName, 13));
+ NDR_GOTO(ndr_pull_uint8(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.Pad1));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.Priority));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.StartTime));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.UntilTime));
+ RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+ r->out.convert,
+ &r->out.info[i].info1.SeparatorPageFilename));
+ RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+ r->out.convert,
+ &r->out.info[i].info1.PrintProcessorDllName));
+ RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+ r->out.convert,
+ &r->out.info[i].info1.PrintDestinationsName));
+ RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+ r->out.convert,
+ &r->out.info[i].info1.PrintParameterString));
+ RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
+ r->out.convert,
+ &r->out.info[i].info1.CommentString));
+ NDR_GOTO(ndr_pull_rap_PrintQStatusCode(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.PrintQStatus));
+ NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
+ NDR_SCALARS, &r->out.info[i].info1.PrintJobCount));
+
+ break;
+ }
+ }
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_OUT_DEBUG(rap_NetPrintQEnum, r);
+ }
+
+ result = NT_STATUS_OK;
+
done:
talloc_free(call);
return result;
r.in.bufsize = 0xffff;
r.in.level = 0;
- torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+ "rap_netservergetinfo level 0 failed");
+
+ if (torture_setting_bool(tctx, "samba3", false)) {
+ torture_skip(tctx, "skipping netservergetinfo level 1 against samba3");
+ }
+
r.in.level = 1;
- torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
+ "rap_netservergetinfo level 1 failed");
return res;
}
struct torture_suite *suite_basic = torture_suite_create(suite, "BASIC");
torture_suite_add_suite(suite, suite_basic);
+ torture_suite_add_suite(suite, torture_rap_rpc(suite));
+ torture_suite_add_suite(suite, torture_rap_printing(suite));
torture_suite_add_1smb_test(suite_basic, "netserverenum",
test_netserverenum);
git.samba.org / samba.git / blobdiff