sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

libds:common Remove DS_DC_* domain functionality flags

Browse Source 
These are just a subset of the DS_DOMAIN_ functionality flags, are compared and often confused with each other.  Just make them one set.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2010-06-21 20:19:02 +10:00
parent 80701e5f29
commit c4482bf53e
6 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libds/common/flags.h
View File

@ -170,19 +170,15 @@
#define SEARCH_FLAG_NEVERVALUEAUDIT 0x0000100 #define SEARCH_FLAG_NEVERVALUEAUDIT 0x0000100
#define SEARCH_FLAG_RODC_ATTRIBUTE 0x0000200 #define SEARCH_FLAG_RODC_ATTRIBUTE 0x0000200
/* "domainFunctionality", "forestFunctionality" in the rootDSE */ /* "domainFunctionality", "forestFunctionality" and "domainControllerFunctionality" in the rootDSE */
#define DS_DOMAIN_FUNCTION_2000 0 #define DS_DOMAIN_FUNCTION_2000 0
#define DS_DOMAIN_FUNCTION_2003_MIXED 1 #define DS_DOMAIN_FUNCTION_2003_MIXED 1 /* Not a valid/meaningfulxs
* domainControllerFunctionality
* Level */
#define DS_DOMAIN_FUNCTION_2003 2 #define DS_DOMAIN_FUNCTION_2003 2
#define DS_DOMAIN_FUNCTION_2008 3 #define DS_DOMAIN_FUNCTION_2008 3
#define DS_DOMAIN_FUNCTION_2008_R2 4 #define DS_DOMAIN_FUNCTION_2008_R2 4
/* "domainControllerFunctionality" in the rootDSE */
#define DS_DC_FUNCTION_2000 0
#define DS_DC_FUNCTION_2003 2
#define DS_DC_FUNCTION_2008 3
#define DS_DC_FUNCTION_2008_R2 4
/* sa->systemFlags on attributes */ /* sa->systemFlags on attributes */
#define DS_FLAG_ATTR_NOT_REPLICATED 0x00000001 #define DS_FLAG_ATTR_NOT_REPLICATED 0x00000001
#define DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER 0x00000002 #define DS_FLAG_ATTR_REQ_PARTIAL_SET_MEMBER 0x00000002

10
source4/dsdb/pydsdb.c
View File

@ -578,14 +578,4 @@ void initdsdb(void)
PyInt_FromLong(DS_DOMAIN_FUNCTION_2008)); PyInt_FromLong(DS_DOMAIN_FUNCTION_2008));
PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2008_R2", PyModule_AddObject(m, "DS_DOMAIN_FUNCTION_2008_R2",
PyInt_FromLong(DS_DOMAIN_FUNCTION_2008_R2)); PyInt_FromLong(DS_DOMAIN_FUNCTION_2008_R2));
/* "domainControllerFunctionality" flags in the rootDSE */
PyModule_AddObject(m, "DS_DC_FUNCTION_2000",
PyInt_FromLong(DS_DC_FUNCTION_2000));
PyModule_AddObject(m, "DS_DC_FUNCTION_2003",
PyInt_FromLong(DS_DC_FUNCTION_2003));
PyModule_AddObject(m, "DS_DC_FUNCTION_2008",
PyInt_FromLong(DS_DC_FUNCTION_2008));
PyModule_AddObject(m, "DS_DC_FUNCTION_2008_R2",
PyInt_FromLong(DS_DC_FUNCTION_2008_R2));
} }

16
source4/lib/ldb/tests/python/ldap_schema.py
View File

@ -20,7 +20,7 @@ from ldb import ERR_CONSTRAINT_VIOLATION
from ldb import Message, MessageElement, Dn from ldb import Message, MessageElement, Dn
from ldb import FLAG_MOD_REPLACE from ldb import FLAG_MOD_REPLACE
from samba import Ldb from samba import Ldb
from samba.dsdb import DS_DC_FUNCTION_2003 from samba.dsdb import DS_DOMAIN_FUNCTION_2003
from subunit.run import SubunitTestRunner from subunit.run import SubunitTestRunner
import unittest import unittest
@ -278,7 +278,7 @@ systemOnly: FALSE
# 1. Create attribute without systemFlags # 1. Create attribute without systemFlags
# msDS-IntId should be created if forest functional # msDS-IntId should be created if forest functional
# level is >= DS_DC_FUNCTION_2003 # level is >= DS_DOMAIN_FUNCTION_2003
# and missing otherwise # and missing otherwise
(attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-1-") (attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-1-")
ldif = self._make_attr_ldif(attr_name, attr_dn) ldif = self._make_attr_ldif(attr_name, attr_dn)
@ -300,7 +300,7 @@ systemOnly: FALSE
res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"])
self.assertEquals(len(res), 1) self.assertEquals(len(res), 1)
self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name)
if self.forest_level >= DS_DC_FUNCTION_2003: if self.forest_level >= DS_DOMAIN_FUNCTION_2003:
if self._is_schema_base_object(res[0]): if self._is_schema_base_object(res[0]):
self.assertTrue("msDS-IntId" not in res[0]) self.assertTrue("msDS-IntId" not in res[0])
else: else:
@ -319,7 +319,7 @@ systemOnly: FALSE
# 2. Create attribute with systemFlags = FLAG_SCHEMA_BASE_OBJECT # 2. Create attribute with systemFlags = FLAG_SCHEMA_BASE_OBJECT
# msDS-IntId should be created if forest functional # msDS-IntId should be created if forest functional
# level is >= DS_DC_FUNCTION_2003 # level is >= DS_DOMAIN_FUNCTION_2003
# and missing otherwise # and missing otherwise
(attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-2-") (attr_name, attr_ldap_name, attr_dn) = self._make_obj_names("msDS-IntId-Attr-2-")
ldif = self._make_attr_ldif(attr_name, attr_dn) ldif = self._make_attr_ldif(attr_name, attr_dn)
@ -342,7 +342,7 @@ systemOnly: FALSE
res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"]) res = self.ldb.search(attr_dn, scope=SCOPE_BASE, attrs=["*"])
self.assertEquals(len(res), 1) self.assertEquals(len(res), 1)
self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name) self.assertEquals(res[0]["lDAPDisplayName"][0], attr_ldap_name)
if self.forest_level >= DS_DC_FUNCTION_2003: if self.forest_level >= DS_DOMAIN_FUNCTION_2003:
if self._is_schema_base_object(res[0]): if self._is_schema_base_object(res[0]):
self.assertTrue("msDS-IntId" not in res[0]) self.assertTrue("msDS-IntId" not in res[0])
else: else:
@ -384,7 +384,7 @@ systemOnly: FALSE
# 1. Create Class without systemFlags # 1. Create Class without systemFlags
# msDS-IntId should be created if forest functional # msDS-IntId should be created if forest functional
# level is >= DS_DC_FUNCTION_2003 # level is >= DS_DOMAIN_FUNCTION_2003
# and missing otherwise # and missing otherwise
(class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-1-") (class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-1-")
ldif = self._make_class_ldif(class_dn, class_name) ldif = self._make_class_ldif(class_dn, class_name)
@ -421,7 +421,7 @@ systemOnly: FALSE
# 2. Create Class with systemFlags = FLAG_SCHEMA_BASE_OBJECT # 2. Create Class with systemFlags = FLAG_SCHEMA_BASE_OBJECT
# msDS-IntId should be created if forest functional # msDS-IntId should be created if forest functional
# level is >= DS_DC_FUNCTION_2003 # level is >= DS_DOMAIN_FUNCTION_2003
# and missing otherwise # and missing otherwise
(class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-3-") (class_name, class_ldap_name, class_dn) = self._make_obj_names("msDS-IntId-Class-3-")
ldif = self._make_class_ldif(class_dn, class_name) ldif = self._make_class_ldif(class_dn, class_name)
@ -469,7 +469,7 @@ systemOnly: FALSE
attrs=["systemFlags", "msDS-IntId", "attributeID", "cn"]) attrs=["systemFlags", "msDS-IntId", "attributeID", "cn"])
self.assertTrue(len(res) > 1) self.assertTrue(len(res) > 1)
for ldb_msg in res: for ldb_msg in res:
if self.forest_level >= DS_DC_FUNCTION_2003: if self.forest_level >= DS_DOMAIN_FUNCTION_2003:
if self._is_schema_base_object(ldb_msg): if self._is_schema_base_object(ldb_msg):
self.assertTrue("msDS-IntId" not in ldb_msg) self.assertTrue("msDS-IntId" not in ldb_msg)
else: else:

2
source4/libnet/libnet_become_dc.c
View File

@ -741,7 +741,7 @@ static int32_t get_dc_function_level(struct loadparm_context *lp_ctx)
{ {
/* per default we are (Windows) 2008 compatible */ /* per default we are (Windows) 2008 compatible */
return lp_parm_int(lp_ctx, NULL, "ads", "dc function level", return lp_parm_int(lp_ctx, NULL, "ads", "dc function level",
DS_DC_FUNCTION_2008); DS_DOMAIN_FUNCTION_2008);
} }
static void becomeDC_recv_cldap(struct tevent_req *req); static void becomeDC_recv_cldap(struct tevent_req *req);

14
source4/scripting/python/samba/netcmd/domainlevel.py
View File

@ -40,10 +40,6 @@ from samba.dsdb import (
DS_DOMAIN_FUNCTION_2003_MIXED, DS_DOMAIN_FUNCTION_2003_MIXED,
DS_DOMAIN_FUNCTION_2008, DS_DOMAIN_FUNCTION_2008,
DS_DOMAIN_FUNCTION_2008_R2, DS_DOMAIN_FUNCTION_2008_R2,
DS_DC_FUNCTION_2000,
DS_DC_FUNCTION_2003,
DS_DC_FUNCTION_2008,
DS_DC_FUNCTION_2008_R2,
) )
class cmd_domainlevel(Command): class cmd_domainlevel(Command):
@ -119,7 +115,7 @@ class cmd_domainlevel(Command):
self.message("\nATTENTION: You run SAMBA 4 on a forest function level lower than Windows 2003 (Native). This isn't supported! Please raise!") self.message("\nATTENTION: You run SAMBA 4 on a forest function level lower than Windows 2003 (Native). This isn't supported! Please raise!")
if level_domain < DS_DOMAIN_FUNCTION_2003: if level_domain < DS_DOMAIN_FUNCTION_2003:
self.message("\nATTENTION: You run SAMBA 4 on a domain function level lower than Windows 2003 (Native). This isn't supported! Please raise!") self.message("\nATTENTION: You run SAMBA 4 on a domain function level lower than Windows 2003 (Native). This isn't supported! Please raise!")
if min_level_dc < DS_DC_FUNCTION_2003: if min_level_dc < DS_DOMAIN_FUNCTION_2003:
self.message("\nATTENTION: You run SAMBA 4 on a lowest function level of a DC lower than Windows 2003. This isn't supported! Please step-up or upgrade the concerning DC(s)!") self.message("\nATTENTION: You run SAMBA 4 on a lowest function level of a DC lower than Windows 2003. This isn't supported! Please step-up or upgrade the concerning DC(s)!")
self.message("") self.message("")
@ -154,13 +150,13 @@ class cmd_domainlevel(Command):
outstr = "higher than 2008 R2" outstr = "higher than 2008 R2"
self.message("Domain function level: (Windows) " + outstr) self.message("Domain function level: (Windows) " + outstr)
if min_level_dc == DS_DC_FUNCTION_2000: if min_level_dc == DS_DOMAIN_FUNCTION_2000:
outstr = "2000" outstr = "2000"
elif min_level_dc == DS_DC_FUNCTION_2003: elif min_level_dc == DS_DOMAIN_FUNCTION_2003:
outstr = "2003" outstr = "2003"
elif min_level_dc == DS_DC_FUNCTION_2008: elif min_level_dc == DS_DOMAIN_FUNCTION_2008:
outstr = "2008" outstr = "2008"
elif min_level_dc == DS_DC_FUNCTION_2008_R2: elif min_level_dc == DS_DOMAIN_FUNCTION_2008_R2:
outstr = "2008 R2" outstr = "2008 R2"
else: else:
outstr = "higher than 2008 R2" outstr = "higher than 2008 R2"

4
source4/scripting/python/samba/provision.py
View File

@ -43,7 +43,7 @@ from samba.auth import system_session, admin_session
import samba import samba
from samba import version, Ldb, substitute_var, valid_netbios_name from samba import version, Ldb, substitute_var, valid_netbios_name
from samba import check_all_substituted, read_and_sub_file, setup_file from samba import check_all_substituted, read_and_sub_file, setup_file
from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008 from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008
from samba.dcerpc import security from samba.dcerpc import security
from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
from samba.idmap import IDmapDB from samba.idmap import IDmapDB
@ -955,7 +955,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, names,
# ATTENTION: Do NOT change these default values without discussion with the # ATTENTION: Do NOT change these default values without discussion with the
# team and/or release manager. They have a big impact on the whole program! # team and/or release manager. They have a big impact on the whole program!
domainControllerFunctionality = DS_DC_FUNCTION_2008 domainControllerFunctionality = DS_DOMAIN_FUNCTION_2008
if dom_for_fun_level is None: if dom_for_fun_level is None:
dom_for_fun_level = DS_DOMAIN_FUNCTION_2003 dom_for_fun_level = DS_DOMAIN_FUNCTION_2003