mirror of
https://github.com/samba-team/samba.git
synced 2025-07-15 16:59:09 +03:00
s4-python: Move dsdb constants to a separate python module.
This commit is contained in:
@ -413,45 +413,3 @@ def ensure_external_module(modulename, location):
|
||||
"samba.external.%s" % modulename, fromlist=["samba.external"])
|
||||
|
||||
version = glue.version
|
||||
|
||||
# "userAccountControl" flags
|
||||
UF_NORMAL_ACCOUNT = glue.UF_NORMAL_ACCOUNT
|
||||
UF_TEMP_DUPLICATE_ACCOUNT = glue.UF_TEMP_DUPLICATE_ACCOUNT
|
||||
UF_SERVER_TRUST_ACCOUNT = glue.UF_SERVER_TRUST_ACCOUNT
|
||||
UF_WORKSTATION_TRUST_ACCOUNT = glue.UF_WORKSTATION_TRUST_ACCOUNT
|
||||
UF_INTERDOMAIN_TRUST_ACCOUNT = glue.UF_INTERDOMAIN_TRUST_ACCOUNT
|
||||
UF_PASSWD_NOTREQD = glue.UF_PASSWD_NOTREQD
|
||||
UF_ACCOUNTDISABLE = glue.UF_ACCOUNTDISABLE
|
||||
|
||||
# "groupType" flags
|
||||
GTYPE_SECURITY_BUILTIN_LOCAL_GROUP = glue.GTYPE_SECURITY_BUILTIN_LOCAL_GROUP
|
||||
GTYPE_SECURITY_GLOBAL_GROUP = glue.GTYPE_SECURITY_GLOBAL_GROUP
|
||||
GTYPE_SECURITY_DOMAIN_LOCAL_GROUP = glue.GTYPE_SECURITY_DOMAIN_LOCAL_GROUP
|
||||
GTYPE_SECURITY_UNIVERSAL_GROUP = glue.GTYPE_SECURITY_UNIVERSAL_GROUP
|
||||
GTYPE_DISTRIBUTION_GLOBAL_GROUP = glue.GTYPE_DISTRIBUTION_GLOBAL_GROUP
|
||||
GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP = glue.GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP
|
||||
GTYPE_DISTRIBUTION_UNIVERSAL_GROUP = glue.GTYPE_DISTRIBUTION_UNIVERSAL_GROUP
|
||||
|
||||
# "sAMAccountType" flags
|
||||
ATYPE_NORMAL_ACCOUNT = glue.ATYPE_NORMAL_ACCOUNT
|
||||
ATYPE_WORKSTATION_TRUST = glue.ATYPE_WORKSTATION_TRUST
|
||||
ATYPE_INTERDOMAIN_TRUST = glue.ATYPE_INTERDOMAIN_TRUST
|
||||
ATYPE_SECURITY_GLOBAL_GROUP = glue.ATYPE_SECURITY_GLOBAL_GROUP
|
||||
ATYPE_SECURITY_LOCAL_GROUP = glue.ATYPE_SECURITY_LOCAL_GROUP
|
||||
ATYPE_SECURITY_UNIVERSAL_GROUP = glue.ATYPE_SECURITY_UNIVERSAL_GROUP
|
||||
ATYPE_DISTRIBUTION_GLOBAL_GROUP = glue.ATYPE_DISTRIBUTION_GLOBAL_GROUP
|
||||
ATYPE_DISTRIBUTION_LOCAL_GROUP = glue.ATYPE_DISTRIBUTION_LOCAL_GROUP
|
||||
ATYPE_DISTRIBUTION_UNIVERSAL_GROUP = glue.ATYPE_DISTRIBUTION_UNIVERSAL_GROUP
|
||||
|
||||
# "domainFunctionality", "forestFunctionality" flags in the rootDSE */
|
||||
DS_DOMAIN_FUNCTION_2000 = glue.DS_DOMAIN_FUNCTION_2000
|
||||
DS_DOMAIN_FUNCTION_2003_MIXED = glue.DS_DOMAIN_FUNCTION_2003_MIXED
|
||||
DS_DOMAIN_FUNCTION_2003 = glue.DS_DOMAIN_FUNCTION_2003
|
||||
DS_DOMAIN_FUNCTION_2008 = glue.DS_DOMAIN_FUNCTION_2008
|
||||
DS_DOMAIN_FUNCTION_2008_R2 = glue.DS_DOMAIN_FUNCTION_2008_R2
|
||||
|
||||
# "domainControllerFunctionality" flags in the rootDSE */
|
||||
DS_DC_FUNCTION_2000 = glue.DS_DC_FUNCTION_2000
|
||||
DS_DC_FUNCTION_2003 = glue.DS_DC_FUNCTION_2003
|
||||
DS_DC_FUNCTION_2008 = glue.DS_DC_FUNCTION_2008
|
||||
DS_DC_FUNCTION_2008_R2 = glue.DS_DC_FUNCTION_2008_R2
|
||||
|
@ -34,7 +34,7 @@ from samba.netcmd import (
|
||||
Option,
|
||||
)
|
||||
from samba.samdb import SamDB
|
||||
from samba import (
|
||||
from samba.dsdb import (
|
||||
DS_DOMAIN_FUNCTION_2000,
|
||||
DS_DOMAIN_FUNCTION_2003,
|
||||
DS_DOMAIN_FUNCTION_2003_MIXED,
|
||||
|
@ -42,7 +42,7 @@ import ldb
|
||||
from samba.auth import system_session, admin_session
|
||||
from samba import glue, version, Ldb, substitute_var, valid_netbios_name
|
||||
from samba import check_all_substituted, read_and_sub_file, setup_file
|
||||
from samba import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008
|
||||
from samba.dsdb import DS_DOMAIN_FUNCTION_2003, DS_DC_FUNCTION_2008
|
||||
from samba.dcerpc import security
|
||||
from samba.dcerpc.misc import SEC_CHAN_BDC, SEC_CHAN_WKSTA
|
||||
from samba.idmap import IDmapDB
|
||||
|
@ -27,7 +27,8 @@ import string
|
||||
import re
|
||||
import shutil
|
||||
|
||||
from samba import Ldb, DS_DOMAIN_FUNCTION_2000
|
||||
from samba import Ldb
|
||||
from samba.dsdb import DS_DOMAIN_FUNCTION_2000
|
||||
from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE
|
||||
import ldb
|
||||
from samba.provision import ProvisionNames, provision_paths_from_lp, FILL_FULL, provision
|
||||
|
Reference in New Issue
Block a user