lsa: rename auth info argument in lsa_CreateTrustedDomainEx2

Guenther

diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl
index c8aaa47c9d359cd6f292d814eb3b6980b34f8f50..c65070e832efa19240015c92b2144e33ab99e594 100644 (file)
--- 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 c6f45eaad0fc7c0370a6a7f80b5b7f6b3038a10a..8244b3ad6fbe42a021fd1d2dd20f08f269761165 100644 (file)
--- 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 318c06ffe99b5d6ec1fd934073e87c71cb0a2e12..82cc8a5f902f713b9b982f1574c5fa6e20c6fb65 100644 (file)
--- 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 1acde1ccaeb70a21f0f3e45943e4aa4ab1d042c3..c1d7389ac67b3d13e213ceafd7384cbc5f47de6b 100644 (file)
--- 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 5e3efeba5f8e4324bcb9e1d33cdcf336a8eee1a7..1c5c1774972e9b8347f0ad7666cd1f214a65e2cd 100644 (file)
--- 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 aee02642100b7a0a9982ac66aa14f61c7ecadd8a..e70e7e6ec02ddad080a94da0fcf264538e00be5b 100644 (file)
--- 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];