diff options
author | Kamen Mazdrashki <kamenim@samba.org> | 2014-04-21 14:32:48 +0200 |
---|---|---|
committer | Kamen Mazdrashki <kamenim@samba.org> | 2014-04-22 23:34:15 +0200 |
commit | 8b68f9b931877cbaed86471dd34076ae929983a2 (patch) | |
tree | 9f0ddd7f72f6b170238a63a3478581d06441defd | |
parent | c9b1f6b366e4f51c8fbf1051bcb44c7d91364b89 (diff) | |
download | samba-8b68f9b931877cbaed86471dd34076ae929983a2.tar.gz samba-8b68f9b931877cbaed86471dd34076ae929983a2.tar.xz samba-8b68f9b931877cbaed86471dd34076ae929983a2.zip |
s4:KCC: Use dsdb.DS_DOMAIN_FUNCTION_2008 constant for DS-Behavior comparisons
DS_BEHAVIOR_WIN2008 was used so far which is a leftover from previous
KCC implementation in "C"
Change-Id: Id9b6551073c0b17cc27e086faa315b01305f39a5
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
-rw-r--r-- | python/samba/kcc_utils.py | 2 | ||||
-rwxr-xr-x | source4/scripting/bin/samba_kcc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/python/samba/kcc_utils.py b/python/samba/kcc_utils.py index 57c31876a69..2692e4539d2 100644 --- a/python/samba/kcc_utils.py +++ b/python/samba/kcc_utils.py @@ -502,7 +502,7 @@ class DirectoryServiceAgent(object): """Is dsa at minimum windows level greater than or equal to (version) :param version: Windows version to test against - (e.g. DS_BEHAVIOR_WIN2008) + (e.g. DS_DOMAIN_FUNCTION_2008) """ if self.dsa_behavior >= version: return True diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index e3d38c9aecc..6301e49b4f9 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -1009,10 +1009,10 @@ class KCC(object): # IF AmIRODC() and cr!nCName corresponds to default NC then # Let dsaobj be the nTDSDSA object of the dc - # IF dsaobj.msDS-Behavior-Version < DS_BEHAVIOR_WIN2008 + # IF dsaobj.msDS-Behavior-Version < DS_DOMAIN_FUNCTION_2008 # Skip dc if self.my_dsa.is_ro() and part.is_default(): - if not dsa.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dsa.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # IF t!name != "IP" and the parent object of dc has no value for @@ -1651,7 +1651,7 @@ class KCC(object): # an RODC, at least one writable domain controller in # the domain must be running Windows Server 2008 if ro and not partial and nc_x.nc_type == NCType.domain: - if not dc_s.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dc_s.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # If we haven't been told to turn off stale connection @@ -1724,7 +1724,7 @@ class KCC(object): # is no minimum windows behavior for those since GCs # have always been present. if ro and not partial and nc_x.nc_type == NCType.domain: - if not dc_s.is_minimum_behavior(DS_BEHAVIOR_WIN2008): + if not dc_s.is_minimum_behavior(dsdb.DS_DOMAIN_FUNCTION_2008): continue # If we haven't been told to turn off stale connection |