diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-11-24 20:30:07 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-11-24 20:30:07 +0100 |
| commit | 9e852a1759e87d708885b690f78cdd11080f8b6e (patch) | |
| tree | 648d86f091bf9d05e3686a7a73aa251315830313 | |
| parent | 4825df832336b0b7e8248856e3676dba3640863b (diff) | |
| download | samba-9e852a1759e87d708885b690f78cdd11080f8b6e.tar.gz samba-9e852a1759e87d708885b690f78cdd11080f8b6e.tar.bz2 samba-9e852a1759e87d708885b690f78cdd11080f8b6e.zip | |
Revert "s4-netlogon: always set the dNSHostName in GetDomainInfo"
This reverts commit 87b6f2e863c6e117643ab6704e50167e849b69cc.
This was the cause of the breakage of the "LogonGetDomainInfo" testsuite. I
think my behaviour is more correct to Windows Server since the test works
against it (at least release 2003 R2).
One problem I discovered is that freshly joined workstations don't get their
DNS name into the directory. Therefore I think also another part (maybe another
RPC call) is able to do this.
| -rw-r--r-- | source4/rpc_server/netlogon/dcerpc_netlogon.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 1a653c293c..fb2601ab2f 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -1217,13 +1217,6 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal "operatingSystem", r->in.query->workstation_info->os_name.string); - if (r->in.query->workstation_info->dns_hostname) { - /* TODO: should this always be done? */ - samdb_msg_add_string(sam_ctx, mem_ctx, new_msg, - "dNSHostname", - r->in.query->workstation_info->dns_hostname); - } - /* * Sets informations from "os_version". On a empty structure * the values are cleared. @@ -1253,6 +1246,9 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal */ if ((r->in.query->workstation_info->workstation_flags & NETR_WS_FLAG_HANDLES_SPN_UPDATE) == 0) { + samdb_msg_set_string(sam_ctx, mem_ctx, new_msg, + "dNSHostname", + r->in.query->workstation_info->dns_hostname); samdb_msg_add_string(sam_ctx, mem_ctx, new_msg, "servicePrincipalName", |