sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4-srvsvc: merge srvsvc_NetSrvGetInfo from s3 idl.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-10-29 20:39:57 +01:00
parent 5cd089edd2
commit c982b36930
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1130,7 +1130,7 @@ import "security.idl", "svcctl.idl";
WERROR srvsvc_NetSrvGetInfo(
[in,unique] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetSrvInfo info
[out,ref,switch_is(level)] srvsvc_NetSrvInfo *info
);
/******************/

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

@ -1468,7 +1468,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
{
struct dcesrv_context *dce_ctx = dce_call->conn->dce_ctx;
ZERO_STRUCT(r->out);
ZERO_STRUCTP(r->out.info);
switch (r->in.level) {
case 100:
@ -1482,7 +1482,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info100->server_name = dcesrv_common_get_server_name(mem_ctx, dce_ctx, r->in.server_unc);
W_ERROR_HAVE_NO_MEMORY(info100->server_name);
r->out.info.info100 = info100;
r->out.info->info100 = info100;
return WERR_OK;
}
case 101:
@ -1502,7 +1502,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info101->comment = talloc_strdup(mem_ctx, lp_serverstring(dce_ctx->lp_ctx));
W_ERROR_HAVE_NO_MEMORY(info101->comment);
r->out.info.info101 = info101;
r->out.info->info101 = info101;
return WERR_OK;
}
case 102:
@ -1531,7 +1531,7 @@ static WERROR dcesrv_srvsvc_NetSrvGetInfo(struct dcesrv_call_state *dce_call, TA
info102->userpath = dcesrv_common_get_userpath(mem_ctx, dce_ctx);
W_ERROR_HAVE_NO_MEMORY(info102->userpath);
r->out.info.info102 = info102;
r->out.info->info102 = info102;
return WERR_OK;
}
default:

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

@ -766,19 +766,15 @@ static bool test_NetSrvGetInfo(struct torture_context *tctx,
{
NTSTATUS status;
struct srvsvc_NetSrvGetInfo r;
struct srvsvc_NetSrvInfo503 i503;
union srvsvc_NetSrvInfo info;
uint32_t levels[] = {100, 101, 102, 502, 503};
int i;
uint32_t resume_handle;
ZERO_STRUCT(i503);
r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p));
for (i=0;i<ARRAY_SIZE(levels);i++) {
ZERO_STRUCT(r.out);
resume_handle = 0;
r.in.level = levels[i];
r.out.info = &info;
torture_comment(tctx, "testing NetSrvGetInfo level %u\n", r.in.level);
status = dcerpc_srvsvc_NetSrvGetInfo(p, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "NetSrvGetInfo failed");