diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-27 16:56:36 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-04-27 18:45:41 +0200 |
| commit | eceffe690912b1fbce4ecddaffd29b52e2cf9cd1 (patch) | |
| tree | 55069977d0250b4239d8b2cb556415374f8f8229 /libcli | |
| parent | 3f1bd92306b2f11b5c8086ef9e0a311d9e99da89 (diff) | |
| download | samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.tar.gz samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.tar.bz2 samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.zip | |
nbt: samlogon/netlogon structures - unify denominations
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/ndr_netlogon.c | 4 | ||||
| -rw-r--r-- | libcli/netlogon.c | 6 |
2 files changed, 5 insertions, 5 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; |