diff options
| -rw-r--r-- | librpc/idl/lsa.idl | 2 | ||||
| -rw-r--r-- | source3/rpc_server/lsa/srv_lsa_nt.c | 10 | ||||
| -rw-r--r-- | source3/utils/net_rpc_trust.c | 2 | ||||
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 6 | ||||
| -rw-r--r-- | source4/torture/rpc/forest_trust.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/lsa.c | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl index c8aaa47c9d..c65070e832 100644 --- a/librpc/idl/lsa.idl +++ b/librpc/idl/lsa.idl @@ -1186,7 +1186,7 @@ import "misc.idl", "security.idl"; NTSTATUS lsa_CreateTrustedDomainEx2( [in] policy_handle *policy_handle, [in] lsa_TrustDomainInfoInfoEx *info, - [in] lsa_TrustDomainInfoAuthInfoInternal *auth_info, + [in] lsa_TrustDomainInfoAuthInfoInternal *auth_info_internal, [in] lsa_TrustedAccessMask access_mask, [out] policy_handle *trustdom_handle ); diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c index c6f45eaad0..8244b3ad6f 100644 --- a/source3/rpc_server/lsa/srv_lsa_nt.c +++ b/source3/rpc_server/lsa/srv_lsa_nt.c @@ -1746,9 +1746,9 @@ NTSTATUS _lsa_CreateTrustedDomainEx2(struct pipes_struct *p, td.trust_type = r->in.info->trust_type; td.trust_attributes = r->in.info->trust_attributes; - if (r->in.auth_info->auth_blob.size != 0) { - auth_blob.length = r->in.auth_info->auth_blob.size; - auth_blob.data = r->in.auth_info->auth_blob.data; + if (r->in.auth_info_internal->auth_blob.size != 0) { + auth_blob.length = r->in.auth_info_internal->auth_blob.size; + auth_blob.data = r->in.auth_info_internal->auth_blob.data; arcfour_crypt_blob(auth_blob.data, auth_blob.length, &p->session_info->session_key); @@ -1821,7 +1821,7 @@ NTSTATUS _lsa_CreateTrustedDomainEx(struct pipes_struct *p, q.in.policy_handle = r->in.policy_handle; q.in.info = r->in.info; - q.in.auth_info = r->in.auth_info; + q.in.auth_info_internal = r->in.auth_info; q.in.access_mask = r->in.access_mask; q.out.trustdom_handle = r->out.trustdom_handle; @@ -1850,7 +1850,7 @@ NTSTATUS _lsa_CreateTrustedDomain(struct pipes_struct *p, c.in.policy_handle = r->in.policy_handle; c.in.info = &info; - c.in.auth_info = &auth_info; + c.in.auth_info_internal = &auth_info; c.in.access_mask = r->in.access_mask; c.out.trustdom_handle = r->out.trustdom_handle; diff --git a/source3/utils/net_rpc_trust.c b/source3/utils/net_rpc_trust.c index 318c06ffe9..82cc8a5f90 100644 --- a/source3/utils/net_rpc_trust.c +++ b/source3/utils/net_rpc_trust.c @@ -128,7 +128,7 @@ static NTSTATUS create_trust(TALLOC_CTX *mem_ctx, r.in.policy_handle = pol_hnd; r.in.info = &trustinfo; - r.in.auth_info = authinfo; + r.in.auth_info_internal = authinfo; r.in.access_mask = LSA_TRUSTED_SET_POSIX | LSA_TRUSTED_SET_AUTH | LSA_TRUSTED_QUERY_DOMAIN_NAME; r.out.trustdom_handle = &trustdom_handle; diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 1acde1ccae..c1d7389ac6 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -932,8 +932,8 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc auth_struct.outgoing.count = 0; auth_struct.incoming.count = 0; } else { - auth_blob = data_blob_const(r->in.auth_info->auth_blob.data, - r->in.auth_info->auth_blob.size); + auth_blob = data_blob_const(r->in.auth_info_internal->auth_blob.data, + r->in.auth_info_internal->auth_blob.size); nt_status = get_trustdom_auth_blob(dce_call, mem_ctx, &auth_blob, &auth_struct); if (!NT_STATUS_IS_OK(nt_status)) { @@ -1139,7 +1139,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomainEx(struct dcesrv_call_state *dce_c r2.in.policy_handle = r->in.policy_handle; r2.in.info = r->in.info; - r2.in.auth_info = r->in.auth_info; + r2.in.auth_info_internal = r->in.auth_info; r2.out.trustdom_handle = r->out.trustdom_handle; return dcesrv_lsa_CreateTrustedDomain_base(dce_call, mem_ctx, &r2, NDR_LSA_CREATETRUSTEDDOMAINEX); } diff --git a/source4/torture/rpc/forest_trust.c b/source4/torture/rpc/forest_trust.c index 5e3efeba5f..1c5c177497 100644 --- a/source4/torture/rpc/forest_trust.c +++ b/source4/torture/rpc/forest_trust.c @@ -122,7 +122,7 @@ static bool test_create_trust_and_set_info(struct dcerpc_pipe *p, r.in.policy_handle = handle; r.in.info = &trustinfo; - r.in.auth_info = authinfo; + r.in.auth_info_internal = authinfo; /* LSA_TRUSTED_QUERY_DOMAIN_NAME is needed for for following * QueryTrustedDomainInfo call, although it seems that Windows does not * expect this */ diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index aee0264210..e70e7e6ec0 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -2480,7 +2480,7 @@ static bool test_CreateTrustedDomainEx2(struct dcerpc_pipe *p, r.in.policy_handle = handle; r.in.info = &trustinfo; - r.in.auth_info = &authinfo; + r.in.auth_info_internal = &authinfo; r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; r.out.trustdom_handle = &trustdom_handle[i]; |