diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-09-23 10:02:57 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-09-27 01:35:36 +0200 |
| commit | a3ecad4237e1c4094263f31204bb8ae06669c951 (patch) | |
| tree | bb8e6abc2aa9610ad290168b0ccac90abf29265e /source4/rpc_server/netlogon | |
| parent | 1ac96a416d7d6db2476f56129166fd9e018e7306 (diff) | |
| download | samba-a3ecad4237e1c4094263f31204bb8ae06669c951.tar.gz samba-a3ecad4237e1c4094263f31204bb8ae06669c951.tar.xz samba-a3ecad4237e1c4094263f31204bb8ae06669c951.zip | |
idl: Merge NETR_TRUST and LSA_TRUST definitions into one set only in lsa.idl
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/rpc_server/netlogon')
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 9312247fae..c5740f65c8 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -37,6 +37,7 @@ #include "dsdb/samdb/ldb_modules/util.h" #include "lib/tsocket/tsocket.h" #include "librpc/gen_ndr/ndr_netlogon.h" +#include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_irpc.h" #include "lib/socket/netif.h" @@ -2295,8 +2296,8 @@ static WERROR fill_trusted_domains_array(TALLOC_CTX *mem_ctx, ldb_msg_find_attr_as_uint(dom_res[i], "trustAttributes", 0); - if ((trusts->array[n].trust_type == NETR_TRUST_TYPE_MIT) || - (trusts->array[n].trust_type == NETR_TRUST_TYPE_DCE)) { + if ((trusts->array[n].trust_type == LSA_TRUST_TYPE_MIT) || + (trusts->array[n].trust_type == LSA_TRUST_TYPE_DCE)) { struct dom_sid zero_sid; ZERO_STRUCT(zero_sid); trusts->array[n].sid = @@ -2402,7 +2403,7 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce NETR_TRUST_FLAG_PRIMARY; /* we are always the root domain for now */ trusts->array[n].parent_index = 0; - trusts->array[n].trust_type = NETR_TRUST_TYPE_UPLEVEL; + trusts->array[n].trust_type = LSA_TRUST_TYPE_UPLEVEL; trusts->array[n].trust_attributes = 0; trusts->array[n].sid = samdb_result_dom_sid(mem_ctx, dom_res[0], |