From eceffe690912b1fbce4ecddaffd29b52e2cf9cd1 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Tue, 27 Apr 2010 16:56:36 +0200 Subject: nbt: samlogon/netlogon structures - unify denominations --- libcli/ndr_netlogon.c | 4 ++-- libcli/netlogon.c | 6 +++--- librpc/gen_ndr/nbt.h | 6 +++--- librpc/gen_ndr/ndr_nbt.c | 18 +++++++++--------- librpc/idl/nbt.idl | 6 +++--- source3/libsmb/clidgram.c | 2 +- source3/libsmb/dsgetdcname.c | 14 +++++++------- source4/cldap_server/netlogon.c | 6 +++--- source4/libnet/libnet_become_dc.c | 2 +- source4/libnet/libnet_unbecome_dc.c | 2 +- source4/nbt_server/irpc.c | 4 ++-- source4/torture/ldap/cldap.c | 12 ++++++------ 12 files changed, 41 insertions(+), 41 deletions(-) diff --git a/libcli/ndr_netlogon.c b/libcli/ndr_netlogon.c index 0354cfb592..1c6b2bccb6 100644 --- a/libcli/ndr_netlogon.c +++ b/libcli/ndr_netlogon.c @@ -131,7 +131,7 @@ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_ NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->forest)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->dns_domain)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->pdc_dns_name)); - NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->domain)); + NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->domain_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->pdc_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->user_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->server_site)); @@ -177,7 +177,7 @@ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_ NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->forest)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->dns_domain)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->pdc_dns_name)); - NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->domain)); + NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->domain_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->pdc_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->user_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->server_site)); diff --git a/libcli/netlogon.c b/libcli/netlogon.c index acfce61cca..9ad941cfb6 100644 --- a/libcli/netlogon.c +++ b/libcli/netlogon.c @@ -152,7 +152,7 @@ void map_netlogon_samlogon_response(struct netlogon_samlogon_response *response) response_5_ex.command = response->data.nt5.command; response_5_ex.pdc_name = response->data.nt5.pdc_name; response_5_ex.user_name = response->data.nt5.user_name; - response_5_ex.domain = response->data.nt5.domain_name; + response_5_ex.domain_name = response->data.nt5.domain_name; response_5_ex.domain_uuid = response->data.nt5.domain_uuid; response_5_ex.forest = response->data.nt5.forest; response_5_ex.dns_domain = response->data.nt5.dns_domain; @@ -169,9 +169,9 @@ void map_netlogon_samlogon_response(struct netlogon_samlogon_response *response) case NETLOGON_NT_VERSION_1: ZERO_STRUCT(response_5_ex); response_5_ex.command = response->data.nt4.command; - response_5_ex.pdc_name = response->data.nt4.server; + response_5_ex.pdc_name = response->data.nt4.pdc_name; response_5_ex.user_name = response->data.nt4.user_name; - response_5_ex.domain = response->data.nt4.domain; + response_5_ex.domain_name = response->data.nt4.domain_name; response_5_ex.nt_version = response->data.nt4.nt_version; response_5_ex.lmnt_token = response->data.nt4.lmnt_token; response_5_ex.lm20_token = response->data.nt4.lm20_token; diff --git a/librpc/gen_ndr/nbt.h b/librpc/gen_ndr/nbt.h index dc39a5c912..49f96c26e1 100644 --- a/librpc/gen_ndr/nbt.h +++ b/librpc/gen_ndr/nbt.h @@ -473,9 +473,9 @@ struct NETLOGON_SAM_LOGON_REQUEST { struct NETLOGON_SAM_LOGON_RESPONSE_NT40 { enum netlogon_command command; - const char * server;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ + const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ - const char * domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ + const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ uint32_t nt_version; uint16_t lmnt_token; uint16_t lm20_token; @@ -506,7 +506,7 @@ struct NETLOGON_SAM_LOGON_RESPONSE_EX { const char * forest; const char * dns_domain; const char * pdc_dns_name; - const char * domain; + const char * domain_name; const char * pdc_name; const char * user_name; const char * server_site; diff --git a/librpc/gen_ndr/ndr_nbt.c b/librpc/gen_ndr/ndr_nbt.c index dc9e8cb8d3..b3fcb85d22 100644 --- a/librpc/gen_ndr/ndr_nbt.c +++ b/librpc/gen_ndr/ndr_nbt.c @@ -1753,7 +1753,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ { uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server)); + NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pdc_name)); ndr->flags = _flags_save_string; } { @@ -1765,7 +1765,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ { uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain)); + NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name)); ndr->flags = _flags_save_string; } NDR_CHECK(ndr_push_netlogon_nt_version_flags(ndr, NDR_SCALARS, r->nt_version)); @@ -1791,7 +1791,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ { uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->server)); + NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pdc_name)); ndr->flags = _flags_save_string; } { @@ -1803,7 +1803,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ { uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain)); + NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name)); ndr->flags = _flags_save_string; } NDR_CHECK(ndr_pull_netlogon_nt_version_flags(ndr, NDR_SCALARS, &r->nt_version)); @@ -1826,9 +1826,9 @@ _PUBLIC_ void ndr_print_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_print *ndr, ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN); ndr->depth++; ndr_print_netlogon_command(ndr, "command", r->command); - ndr_print_string(ndr, "server", r->server); + ndr_print_string(ndr, "pdc_name", r->pdc_name); ndr_print_string(ndr, "user_name", r->user_name); - ndr_print_string(ndr, "domain", r->domain); + ndr_print_string(ndr, "domain_name", r->domain_name); ndr_print_netlogon_nt_version_flags(ndr, "nt_version", r->nt_version); ndr_print_uint16(ndr, "lmnt_token", r->lmnt_token); ndr_print_uint16(ndr, "lm20_token", r->lm20_token); @@ -1967,7 +1967,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX(struct ndr_pu NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->forest)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->dns_domain)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->pdc_dns_name)); - NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->domain)); + NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->domain_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->pdc_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->user_name)); NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->server_site)); @@ -2006,7 +2006,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX(struct ndr_pu NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->forest)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->dns_domain)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->pdc_dns_name)); - NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->domain)); + NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->domain_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->pdc_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->user_name)); NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->server_site)); @@ -2045,7 +2045,7 @@ _PUBLIC_ void ndr_print_NETLOGON_SAM_LOGON_RESPONSE_EX(struct ndr_print *ndr, co ndr_print_nbt_string(ndr, "forest", r->forest); ndr_print_nbt_string(ndr, "dns_domain", r->dns_domain); ndr_print_nbt_string(ndr, "pdc_dns_name", r->pdc_dns_name); - ndr_print_nbt_string(ndr, "domain", r->domain); + ndr_print_nbt_string(ndr, "domain_name", r->domain_name); ndr_print_nbt_string(ndr, "pdc_name", r->pdc_name); ndr_print_nbt_string(ndr, "user_name", r->user_name); ndr_print_nbt_string(ndr, "server_site", r->server_site); diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl index a51132c4d4..6d9f9b5557 100644 --- a/librpc/idl/nbt.idl +++ b/librpc/idl/nbt.idl @@ -415,9 +415,9 @@ interface nbt typedef [flag(NDR_NOALIGN),public] struct { netlogon_command command; - nstring server; + nstring pdc_name; nstring user_name; - nstring domain; + nstring domain_name; netlogon_nt_version_flags nt_version; uint16 lmnt_token; uint16 lm20_token; @@ -451,7 +451,7 @@ interface nbt nbt_string forest; nbt_string dns_domain; nbt_string pdc_dns_name; - nbt_string domain; + nbt_string domain_name; nbt_string pdc_name; nbt_string user_name; nbt_string server_site; diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index f5dbd72f22..bce57cec3a 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -279,7 +279,7 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx, /* do we still need this ? */ *nt_version = r.ntver; - returned_domain = r.data.nt5_ex.domain; + returned_domain = r.data.nt5_ex.domain_name; returned_dc = r.data.nt5_ex.pdc_name; if (!strequal(returned_domain, domain_name)) { diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index 1e1eac33b3..8c50a0aa39 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -196,13 +196,13 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx, return ndr_map_error2ntstatus(ndr_err); } - if (r->domain) { - status = dsgetdcname_cache_store(mem_ctx, r->domain, &blob); + if (r->domain_name) { + status = dsgetdcname_cache_store(mem_ctx, r->domain_name, &blob); if (!NT_STATUS_IS_OK(status)) { goto done; } if (r->client_site) { - sitename_store(r->domain, r->client_site); + sitename_store(r->domain_name, r->client_site); } } if (r->dns_domain) { @@ -786,7 +786,7 @@ static NTSTATUS make_dc_info_from_cldap_reply(TALLOC_CTX *mem_ctx, map_dc_and_domain_names(flags, r->pdc_name, - r->domain, + r->domain_name, r->pdc_dns_name, r->dns_domain, &dc_flags, @@ -1002,9 +1002,9 @@ static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx, nt_version = NETLOGON_NT_VERSION_1; logon1.nt_version = nt_version; - logon1.server = tmp_dc_name; - logon1.domain = talloc_strdup_upper(mem_ctx, domain_name); - NT_STATUS_HAVE_NO_MEMORY(logon1.domain); + logon1.pdc_name = tmp_dc_name; + logon1.domain_name = talloc_strdup_upper(mem_ctx, domain_name); + NT_STATUS_HAVE_NO_MEMORY(logon1.domain_name); r->data.nt4 = logon1; r->ntver = nt_version; diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index ec9ecc3b75..37d3b8386b 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -312,7 +312,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, } netlogon->data.nt5_ex.pdc_name = pdc_name; netlogon->data.nt5_ex.user_name = user; - netlogon->data.nt5_ex.domain = flatname; + netlogon->data.nt5_ex.domain_name = flatname; netlogon->data.nt5_ex.domain_uuid = domain_uuid; netlogon->data.nt5_ex.forest = forest_domain; netlogon->data.nt5_ex.dns_domain = dns_domain; @@ -361,9 +361,9 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, } else { netlogon->data.nt4.command = LOGON_SAM_LOGON_USER_UNKNOWN; } - netlogon->data.nt4.server = pdc_name; + netlogon->data.nt4.pdc_name = pdc_name; netlogon->data.nt4.user_name = user; - netlogon->data.nt4.domain = flatname; + netlogon->data.nt4.domain_name = flatname; netlogon->data.nt4.nt_version = NETLOGON_NT_VERSION_1; netlogon->data.nt4.lmnt_token = 0xFFFF; netlogon->data.nt4.lm20_token = 0xFFFF; diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index 74242c02d4..a284b33e6f 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -811,7 +811,7 @@ static void becomeDC_recv_cldap(struct tevent_req *req) s->cldap.netlogon = s->cldap.io.out.netlogon.data.nt5_ex; s->domain.dns_name = s->cldap.netlogon.dns_domain; - s->domain.netbios_name = s->cldap.netlogon.domain; + s->domain.netbios_name = s->cldap.netlogon.domain_name; s->domain.guid = s->cldap.netlogon.domain_uuid; s->forest.dns_name = s->cldap.netlogon.forest; diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index 208854e3b2..b584c75be6 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -307,7 +307,7 @@ static void unbecomeDC_recv_cldap(struct tevent_req *req) s->cldap.netlogon = s->cldap.io.out.netlogon.data.nt5_ex; s->domain.dns_name = s->cldap.netlogon.dns_domain; - s->domain.netbios_name = s->cldap.netlogon.domain; + s->domain.netbios_name = s->cldap.netlogon.domain_name; s->domain.guid = s->cldap.netlogon.domain_uuid; s->source_dsa.dns_name = s->cldap.netlogon.pdc_dns_name; diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c index dbaebf66f7..261e066b16 100644 --- a/source4/nbt_server/irpc.c +++ b/source4/nbt_server/irpc.c @@ -85,12 +85,12 @@ static void getdc_recv_netlogon_reply(struct dgram_mailslot_handler *dgmslot, goto done; } - p = netlogon.data.samlogon.data.nt4.server; + p = netlogon.data.samlogon.data.nt4.pdc_name; DEBUG(10, ("NTLOGON_SAM_LOGON_REPLY: server: %s, user: %s, " "domain: %s\n", p, netlogon.data.samlogon.data.nt4.user_name, - netlogon.data.samlogon.data.nt4.domain)); + netlogon.data.samlogon.data.nt4.domain_name)); if (*p == '\\') p += 1; if (*p == '\\') p += 1; diff --git a/source4/torture/ldap/cldap.c b/source4/torture/ldap/cldap.c index 247a56ef0f..05af0a6403 100644 --- a/source4/torture/ldap/cldap.c +++ b/source4/torture/ldap/cldap.c @@ -188,7 +188,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_STATUS(status, NT_STATUS_OK); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, search.in.user); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); @@ -201,7 +201,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_VAL(search.out.netlogon.data.nt5_ex.command, LOGON_SAM_LOGON_USER_UNKNOWN_EX); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, search.in.user); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); @@ -220,7 +220,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_VAL(search.out.netlogon.data.nt5_ex.command, LOGON_SAM_LOGON_RESPONSE_EX); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, ""); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); @@ -233,7 +233,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_VAL(search.out.netlogon.data.nt5_ex.command, LOGON_SAM_LOGON_RESPONSE_EX); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, ""); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); @@ -247,7 +247,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_VAL(search.out.netlogon.data.nt5_ex.command, LOGON_SAM_LOGON_RESPONSE_EX); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, ""); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); @@ -259,7 +259,7 @@ static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest) CHECK_STATUS(status, NT_STATUS_OK); CHECK_STRING(search.out.netlogon.data.nt5_ex.forest, n1.data.nt5_ex.dns_domain); CHECK_STRING(search.out.netlogon.data.nt5_ex.dns_domain, n1.data.nt5_ex.dns_domain); - CHECK_STRING(search.out.netlogon.data.nt5_ex.domain, n1.data.nt5_ex.domain); + CHECK_STRING(search.out.netlogon.data.nt5_ex.domain_name, n1.data.nt5_ex.domain_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.pdc_name, n1.data.nt5_ex.pdc_name); CHECK_STRING(search.out.netlogon.data.nt5_ex.user_name, search.in.user); CHECK_STRING(search.out.netlogon.data.nt5_ex.server_site, n1.data.nt5_ex.server_site); -- cgit