diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-28 02:25:30 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-29 08:57:27 +0100 |
| commit | 4f6264b66c0e9f8d863ee547cc5902d35a0826de (patch) | |
| tree | 96848ca5566d9b5c18d22614f3f8032bfe32c08b /source4 | |
| parent | 359927dd34e83875acd197b1b3e232693d8c66f5 (diff) | |
| download | samba-4f6264b66c0e9f8d863ee547cc5902d35a0826de.tar.gz samba-4f6264b66c0e9f8d863ee547cc5902d35a0826de.tar.bz2 samba-4f6264b66c0e9f8d863ee547cc5902d35a0826de.zip | |
s4-netlogon: merge netr_LogonGetDomainInfo from s3 idl.
Guenther
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/netlogon.idl | 2 | ||||
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/netlogon.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index 33b3c815ec..7cb83b3d69 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -1237,7 +1237,7 @@ interface netlogon [in,out,ref] netr_Authenticator *return_authenticator, [in] uint32 level, [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 { diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 5bf60d1578..04c16ab484 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -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; info1->supported_enc_types = 0; /* w2008 gives this 0 */ - r->out.info.info1 = info1; + r->out.info->info1 = info1; return NT_STATUS_OK; } diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index ce45065ac8..232d10323c 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -1452,6 +1452,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx, struct netr_DomainQuery1 q1; struct netr_Authenticator a; struct creds_CredentialState *creds; + union netr_DomainInfo info; if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, machine_credentials, &creds)) { @@ -1468,6 +1469,7 @@ static bool test_GetDomainInfo(struct torture_context *tctx, r.in.credential = &a; r.in.return_authenticator = &a; r.out.return_authenticator = &a; + r.out.info = &info; r.in.query.query1 = &q1; ZERO_STRUCT(q1); @@ -1519,6 +1521,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx, struct rpc_request *req[ASYNC_COUNT]; int i; int *async_counter = talloc(tctx, int); + union netr_DomainInfo info; if (!test_SetupCredentials3(p, tctx, NETLOGON_NEG_AUTH2_ADS_FLAGS, machine_credentials, &creds)) { @@ -1532,6 +1535,7 @@ static bool test_GetDomainInfo_async(struct torture_context *tctx, r.in.credential = &a; r.in.return_authenticator = &a; r.out.return_authenticator = &a; + r.out.info = &info; r.in.query.query1 = &q1; ZERO_STRUCT(q1); |