sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4-srvsvc: merge srvsvc_NetCharDevQEnum from s3 idl.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-10-30 16:49:21 +01:00
parent 07f1bb3abc
commit d1340df8b8
3 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/librpc/idl/srvsvc.idl
View File

@ -120,15 +120,19 @@ import "security.idl", "svcctl.idl";
[default] ;
} srvsvc_NetCharDevQCtr;
typedef struct {
uint32 level;
[switch_is(level)] srvsvc_NetCharDevQCtr ctr;
} srvsvc_NetCharDevQInfoCtr;
/******************/
/* Function: 0x03 */
WERROR srvsvc_NetCharDevQEnum(
[in,unique] [string,charset(UTF16)] uint16 *server_unc,
[in,unique] [string,charset(UTF16)] uint16 *user,
[in,out] uint32 level,
[in,out,switch_is(level)] srvsvc_NetCharDevQCtr ctr,
[in,out,ref] srvsvc_NetCharDevQInfoCtr *info_ctr,
[in] uint32 max_buffer,
[out] uint32 totalentries,
[out,ref] uint32 *totalentries,
[in,out,unique] uint32 *resume_handle
);

22
source4/rpc_server/srvsvc/dcesrv_srvsvc.c
View File

@ -115,28 +115,26 @@ static WERROR dcesrv_srvsvc_NetCharDevControl(struct dcesrv_call_state *dce_call
static WERROR dcesrv_srvsvc_NetCharDevQEnum(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
struct srvsvc_NetCharDevQEnum *r)
{
r->out.level = r->in.level;
r->out.totalentries = 0;
r->out.resume_handle = NULL;
*r->out.totalentries = 0;
switch (r->in.level) {
switch (r->in.info_ctr->level) {
case 0:
{
r->out.ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr0);
W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr0);
r->out.info_ctr->ctr.ctr0 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr0);
W_ERROR_HAVE_NO_MEMORY(r->out.info_ctr->ctr.ctr0);
r->out.ctr.ctr0->count = 0;
r->out.ctr.ctr0->array = NULL;
r->out.info_ctr->ctr.ctr0->count = 0;
r->out.info_ctr->ctr.ctr0->array = NULL;
return WERR_NOT_SUPPORTED;
}
case 1:
{
r->out.ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr1);
W_ERROR_HAVE_NO_MEMORY(r->out.ctr.ctr1);
r->out.info_ctr->ctr.ctr1 = talloc(mem_ctx, struct srvsvc_NetCharDevQCtr1);
W_ERROR_HAVE_NO_MEMORY(r->out.info_ctr->ctr.ctr1);
r->out.ctr.ctr1->count = 0;
r->out.ctr.ctr1->array = NULL;
r->out.info_ctr->ctr.ctr1->count = 0;
r->out.info_ctr->ctr.ctr1->array = NULL;
return WERR_NOT_SUPPORTED;
}

33
source4/torture/rpc/srvsvc.c
View File

@ -228,24 +228,39 @@ static bool test_NetCharDevQEnum(struct torture_context *tctx,
{
NTSTATUS status;
struct srvsvc_NetCharDevQEnum r;
struct srvsvc_NetCharDevQInfoCtr info_ctr;
struct srvsvc_NetCharDevQCtr0 c0;
struct srvsvc_NetCharDevQCtr1 c1;
uint32_t totalentries = 0;
uint32_t levels[] = {0, 1};
int i;
ZERO_STRUCT(info_ctr);
r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
r.in.user = talloc_asprintf(tctx,"%s","Administrator");
r.in.ctr.ctr0 = &c0;
r.in.ctr.ctr0->count = 0;
r.in.ctr.ctr0->array = NULL;
r.in.info_ctr = &info_ctr;
r.in.max_buffer = (uint32_t)-1;
r.in.resume_handle = NULL;
r.out.totalentries = &totalentries;
r.out.info_ctr = &info_ctr;
for (i=0;i<ARRAY_SIZE(levels);i++) {
int j;
ZERO_STRUCT(r.out);
r.in.level = levels[i];
torture_comment(tctx, "testing NetCharDevQEnum level %u\n", r.in.level);
info_ctr.level = levels[i];
switch (info_ctr.level) {
case 0:
ZERO_STRUCT(c0);
info_ctr.ctr.ctr0 = &c0;
break;
case 1:
ZERO_STRUCT(c1);
info_ctr.ctr.ctr1 = &c1;
break;
}
torture_comment(tctx, "testing NetCharDevQEnum level %u\n", info_ctr.level);
status = dcerpc_srvsvc_NetCharDevQEnum(p, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "NetCharDevQEnum failed");
if (!W_ERROR_IS_OK(r.out.result)) {
@ -254,10 +269,10 @@ static bool test_NetCharDevQEnum(struct torture_context *tctx,
}
/* call test_NetCharDevGetInfo and test_NetCharDevControl for each returned share */
if (r.in.level == 1) {
for (j=0;j<r.out.ctr.ctr1->count;j++) {
if (info_ctr.level == 1) {
for (j=0;j<r.out.info_ctr->ctr.ctr1->count;j++) {
const char *device;
device = r.out.ctr.ctr1->array[j].device;
device = r.out.info_ctr->ctr.ctr1->array[j].device;
if (!test_NetCharDevQGetInfo(p, tctx, device)) {
return false;
}