sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4:provision: use better values for operatingSystem[Version]

Browse Source 
Some clients (e.g. an exchange server) check operatingSystemVersion
in order to check if a domain controller is new enough.

So we better use a value matching the dc functional level.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2015-07-22 12:44:32 +02:00 committed by Andrew Bartlett
parent 9a79bed41e
commit 3ed1ba6fed
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/samba/provision/__init__.py
View File

@ -1137,6 +1137,14 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
if dc_rid is None:
dc_rid = next_rid
# Some clients/applications (like exchange) make use of
# the operatingSystemVersion attribute in order to
# find if a DC is good enough.
#
# So we better use a value matching a Windows DC
# with the same domainControllerFunctionality level
operatingSystemVersion = samba.dsdb.dc_operatingSystemVersion(domainControllerFunctionality)
setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), {
"CONFIGDN": names.configdn,
"SCHEMADN": names.schemadn,
@ -1148,7 +1156,8 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
"MACHINEPASS_B64": b64encode(machinepass.encode('utf-16-le')).decode('utf8'),
"DOMAINSID": str(domainsid),
"DCRID": str(dc_rid),
"SAMBA_VERSION_STRING": version,
"OPERATING_SYSTEM": "Samba-%s" % version,
"OPERATING_SYSTEM_VERSION": operatingSystemVersion,
"NTDSGUID": ntdsguid_line,
"DOMAIN_CONTROLLER_FUNCTIONALITY": str(
domainControllerFunctionality),

4
source4/setup/provision_self_join.ldif
View File

@ -12,8 +12,8 @@ dNSHostName: ${DNSNAME}
# "MSDFSR-ComputerReferenceBL" doesn't exist since we still miss DFSR support
# "isCritcalSystemObject" is now filled in by the samldb LDB module
localPolicyFlags: 0
operatingSystem: Samba
operatingSystemVersion: ${SAMBA_VERSION_STRING}
operatingSystem: ${OPERATING_SYSTEM}
operatingSystemVersion: ${OPERATING_SYSTEM_VERSION}
sAMAccountName: ${NETBIOSNAME}$
userAccountControl: 532480
clearTextPassword:: ${MACHINEPASS_B64}