From 4be253fe2fe7b24f322952f94c973a5d250aec4b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 30 Oct 2009 14:31:25 +1100 Subject: s4:provision Move 'Schema' into it's own file --- source4/scripting/bin/rebuildextendeddn | 3 ++- source4/scripting/bin/upgradeschema.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/scripting/bin') diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn index 618d179719..5ae27aa027 100755 --- a/source4/scripting/bin/rebuildextendeddn +++ b/source4/scripting/bin/rebuildextendeddn @@ -40,7 +40,8 @@ import ldb import samba.getopt as options from samba.samdb import SamDB from samba import param -from samba.provision import ProvisionPaths, ProvisionNames,provision_paths_from_lp,get_dnsyntax_attributes,get_linked_attributes +from samba.provision import ProvisionPaths, ProvisionNames, provision_paths_from_lp +from samba.schema import get_dnsyntax_attributes, get_linked_attributes parser = optparse.OptionParser("provision [options]") sambaopts = options.SambaOptions(parser) diff --git a/source4/scripting/bin/upgradeschema.py b/source4/scripting/bin/upgradeschema.py index 52579480cd..cf8262aef9 100755 --- a/source4/scripting/bin/upgradeschema.py +++ b/source4/scripting/bin/upgradeschema.py @@ -44,7 +44,8 @@ import ldb import samba.getopt as options from samba.samdb import SamDB from samba import param -from samba.provision import ProvisionNames,provision_paths_from_lp,find_setup_dir,Schema,get_linked_attributes,FILL_FULL,provision +from samba.provision import ProvisionNames,provision_paths_from_lp,find_setup_dir,FILL_FULL,provision +from samba.schema import get_dnsyntax_attributes, get_linked_attributes, Schema from samba.dcerpc import misc, security from samba.ndr import ndr_pack, ndr_unpack @@ -283,7 +284,7 @@ def newprovision(names,setup_dir,creds,session,smbconf): wheel=None, users=None, serverrole="domain controller", ldap_backend_extra_port=None, - ldap_backend_type=None, + backend_type=None, ldapadminpass=None, ol_mmr_urls=None, slapd_path=None, -- cgit