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 /source3/libsmb | |
| parent | 3f1bd92306b2f11b5c8086ef9e0a311d9e99da89 (diff) | |
| download | samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.tar.gz samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.tar.bz2 samba-eceffe690912b1fbce4ecddaffd29b52e2cf9cd1.zip | |
nbt: samlogon/netlogon structures - unify denominations
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clidgram.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/dsgetdcname.c | 14 |
2 files changed, 8 insertions, 8 deletions
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; |