diff options
| -rw-r--r-- | librpc/gen_ndr/lsa.h | 4 | ||||
| -rw-r--r-- | librpc/gen_ndr/ndr_lsa.c | 12 | ||||
| -rw-r--r-- | librpc/idl/lsa.idl | 4 | ||||
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/librpc/gen_ndr/lsa.h b/librpc/gen_ndr/lsa.h index cf3d1bb5e1..1c6323fafd 100644 --- a/librpc/gen_ndr/lsa.h +++ b/librpc/gen_ndr/lsa.h @@ -763,9 +763,9 @@ enum lsa_ForestTrustRecordType struct lsa_ForestTrustRecord { uint32_t flags; - enum lsa_ForestTrustRecordType level; + enum lsa_ForestTrustRecordType type; uint64_t time; - union lsa_ForestTrustData forest_trust_data;/* [switch_is(level)] */ + union lsa_ForestTrustData forest_trust_data;/* [switch_is(type)] */ }; struct lsa_ForestTrustInformation { diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c index 662400d939..55f876a3fa 100644 --- a/librpc/gen_ndr/ndr_lsa.c +++ b/librpc/gen_ndr/ndr_lsa.c @@ -5205,9 +5205,9 @@ static enum ndr_err_code ndr_push_lsa_ForestTrustRecord(struct ndr_push *ndr, in if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 8)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags)); - NDR_CHECK(ndr_push_lsa_ForestTrustRecordType(ndr, NDR_SCALARS, r->level)); + NDR_CHECK(ndr_push_lsa_ForestTrustRecordType(ndr, NDR_SCALARS, r->type)); NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->time)); - NDR_CHECK(ndr_push_set_switch_value(ndr, &r->forest_trust_data, r->level)); + NDR_CHECK(ndr_push_set_switch_value(ndr, &r->forest_trust_data, r->type)); NDR_CHECK(ndr_push_lsa_ForestTrustData(ndr, NDR_SCALARS, &r->forest_trust_data)); NDR_CHECK(ndr_push_trailer_align(ndr, 8)); } @@ -5222,9 +5222,9 @@ static enum ndr_err_code ndr_pull_lsa_ForestTrustRecord(struct ndr_pull *ndr, in if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 8)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags)); - NDR_CHECK(ndr_pull_lsa_ForestTrustRecordType(ndr, NDR_SCALARS, &r->level)); + NDR_CHECK(ndr_pull_lsa_ForestTrustRecordType(ndr, NDR_SCALARS, &r->type)); NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->time)); - NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->forest_trust_data, r->level)); + NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->forest_trust_data, r->type)); NDR_CHECK(ndr_pull_lsa_ForestTrustData(ndr, NDR_SCALARS, &r->forest_trust_data)); NDR_CHECK(ndr_pull_trailer_align(ndr, 8)); } @@ -5239,9 +5239,9 @@ _PUBLIC_ void ndr_print_lsa_ForestTrustRecord(struct ndr_print *ndr, const char ndr_print_struct(ndr, name, "lsa_ForestTrustRecord"); ndr->depth++; ndr_print_uint32(ndr, "flags", r->flags); - ndr_print_lsa_ForestTrustRecordType(ndr, "level", r->level); + ndr_print_lsa_ForestTrustRecordType(ndr, "type", r->type); ndr_print_hyper(ndr, "time", r->time); - ndr_print_set_switch_value(ndr, &r->forest_trust_data, r->level); + ndr_print_set_switch_value(ndr, &r->forest_trust_data, r->type); ndr_print_lsa_ForestTrustData(ndr, "forest_trust_data", &r->forest_trust_data); ndr->depth--; } diff --git a/librpc/idl/lsa.idl b/librpc/idl/lsa.idl index 6b3536a8c6..8f91d0c82f 100644 --- a/librpc/idl/lsa.idl +++ b/librpc/idl/lsa.idl @@ -1294,9 +1294,9 @@ import "misc.idl", "security.idl"; typedef struct { uint32 flags; - lsa_ForestTrustRecordType level; + lsa_ForestTrustRecordType type; hyper time; - [switch_is(level)] lsa_ForestTrustData forest_trust_data; + [switch_is(type)] lsa_ForestTrustData forest_trust_data; } lsa_ForestTrustRecord; typedef [public] struct { diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index e82158f4a0..ba27b014ea 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -1901,7 +1901,7 @@ static WERROR fill_forest_trust_array(TALLOC_CTX *mem_ctx, W_ERROR_HAVE_NO_MEMORY(e); e->flags = 0; - e->level = LSA_FOREST_TRUST_TOP_LEVEL_NAME; + e->type = LSA_FOREST_TRUST_TOP_LEVEL_NAME; e->time = 0; /* so far always 0 in trces. */ e->forest_trust_data.top_level_name.string = lp_dnsdomain(lp_ctx); @@ -1919,7 +1919,7 @@ static WERROR fill_forest_trust_array(TALLOC_CTX *mem_ctx, /* TODO: check if disabled and set flags accordingly */ e->flags = 0; - e->level = LSA_FOREST_TRUST_DOMAIN_INFO; + e->type = LSA_FOREST_TRUST_DOMAIN_INFO; e->time = 0; /* so far always 0 in traces. */ domain_info = &e->forest_trust_data.domain_info; |