summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-04-27 16:32:46 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-04-27 18:45:40 +0200
commit3f1bd92306b2f11b5c8086ef9e0a311d9e99da89 (patch)
treef0dcdd4e41d9eda6c9a0f0fa00f2b68f6c5537db /source4
parenta89ba9e21d53ae2c163e6cdaf4198d3148d5019e (diff)
downloadsamba-3f1bd92306b2f11b5c8086ef9e0a311d9e99da89.tar.gz
samba-3f1bd92306b2f11b5c8086ef9e0a311d9e99da89.tar.bz2
samba-3f1bd92306b2f11b5c8086ef9e0a311d9e99da89.zip
s4:fill_netlogon_samlogon_response - reorder assign operations (to be consistent)
Diffstat (limited to 'source4')
-rw-r--r--source4/cldap_server/netlogon.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index e1453bf955..ec9ecc3b75 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -310,17 +310,15 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
} else {
netlogon->data.nt5_ex.command = LOGON_SAM_LOGON_USER_UNKNOWN_EX;
}
- netlogon->data.nt5_ex.server_type = server_type;
+ 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_uuid = domain_uuid;
netlogon->data.nt5_ex.forest = forest_domain;
netlogon->data.nt5_ex.dns_domain = dns_domain;
netlogon->data.nt5_ex.pdc_dns_name = pdc_dns_name;
- netlogon->data.nt5_ex.domain = flatname;
- netlogon->data.nt5_ex.pdc_name = lp_netbios_name(lp_ctx);
- netlogon->data.nt5_ex.user_name = user;
netlogon->data.nt5_ex.server_site = server_site;
netlogon->data.nt5_ex.client_site = client_site;
-
if (version & NETLOGON_NT_VERSION_5EX_WITH_IP) {
/* Clearly this needs to be fixed up for IPv6 */
extra_flags = NETLOGON_NT_VERSION_5EX_WITH_IP;
@@ -328,6 +326,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx,
netlogon->data.nt5_ex.sockaddr.pdc_ip = pdc_ip;
netlogon->data.nt5_ex.sockaddr.remaining = data_blob_talloc_zero(mem_ctx, 8);
}
+ netlogon->data.nt5_ex.server_type = server_type;
netlogon->data.nt5_ex.nt_version = NETLOGON_NT_VERSION_1|NETLOGON_NT_VERSION_5EX|extra_flags;
netlogon->data.nt5_ex.lmnt_token = 0xFFFF;
netlogon->data.nt5_ex.lm20_token = 0xFFFF;