sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

s4-netlogon: merge netr_LogonGetDomainInfo from s3 idl.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-10-28 02:25:30 +01:00
parent 359927dd34
commit 4f6264b66c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1237,7 +1237,7 @@ interface netlogon
[in,out,ref] netr_Authenticator *return_authenticator, [in,out,ref] netr_Authenticator *return_authenticator,
[in] uint32 level, [in] uint32 level,
[in,switch_is(level)] netr_DomainQuery query, [in,switch_is(level)] netr_DomainQuery query,
[out,switch_is(level)] netr_DomainInfo info [out,ref,switch_is(level)] netr_DomainInfo *info
); );
typedef [flag(NDR_PAHEX)] struct { typedef [flag(NDR_PAHEX)] struct {

2
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -1077,7 +1077,7 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS | NETR_WS_FLAG_HANDLES_SPN_UPDATE; NETR_WS_FLAG_HANDLES_INBOUND_TRUSTS | NETR_WS_FLAG_HANDLES_SPN_UPDATE;
info1->supported_enc_types = 0; /* w2008 gives this 0 */ info1->supported_enc_types = 0; /* w2008 gives this 0 */
r->out.info.info1 = info1; r->out.info->info1 = info1;
return NT_STATUS_OK; return NT_STATUS_OK;
} }

4
source4/torture/rpc/netlogon.c
View File

@ -1452,6 +1452,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
struct netr_DomainQuery1 q1; struct netr_DomainQuery1 q1;
struct netr_Authenticator a; struct netr_Authenticator a;
struct creds_CredentialState *creds; struct creds_CredentialState *creds;
union netr_DomainInfo info;
if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS,
machine_credentials, &creds)) { machine_credentials, &creds)) {
@ -1468,6 +1469,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx,
r.in.credential = &a; r.in.credential = &a;
r.in.return_authenticator = &a; r.in.return_authenticator = &a;
r.out.return_authenticator = &a; r.out.return_authenticator = &a;
r.out.info = &info;
r.in.query.query1 = &q1; r.in.query.query1 = &q1;
ZERO_STRUCT(q1); ZERO_STRUCT(q1);
@ -1519,6 +1521,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
struct rpc_request *req[ASYNC_COUNT]; struct rpc_request *req[ASYNC_COUNT];
int i; int i;
int *async_counter = talloc(tctx, int); int *async_counter = talloc(tctx, int);
union netr_DomainInfo info;
if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS,
machine_credentials, &creds)) { machine_credentials, &creds)) {
@ -1532,6 +1535,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx,
r.in.credential = &a; r.in.credential = &a;
r.in.return_authenticator = &a; r.in.return_authenticator = &a;
r.out.return_authenticator = &a; r.out.return_authenticator = &a;
r.out.info = &info;
r.in.query.query1 = &q1; r.in.query.query1 = &q1;
ZERO_STRUCT(q1); ZERO_STRUCT(q1);