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>

diff --git a/python/samba/kcc_utils.py b/python/samba/kcc_utils.py
index 57c31876a69aed74abcc97c3a697410eef8015bb..2692e4539d229e3072316f390346bae5bfff39cd 100644 (file)
--- 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 e3d38c9aecc94d2d51d3e9faaf3327bbefaacff9..6301e49b4f97f5ff6a3c09a09957089b950420b7 100755 (executable)
--- 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