summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-30 14:31:25 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-11-02 16:36:55 +1100
commit4be253fe2fe7b24f322952f94c973a5d250aec4b (patch)
tree61664f83461f93975e501e64e8d7e465d6109885 /source4/scripting/bin
parent76d289bb0e791c7c9fb892a368c767aed2635279 (diff)
downloadsamba-4be253fe2fe7b24f322952f94c973a5d250aec4b.tar.gz
samba-4be253fe2fe7b24f322952f94c973a5d250aec4b.tar.bz2
samba-4be253fe2fe7b24f322952f94c973a5d250aec4b.zip
s4:provision Move 'Schema' into it's own file
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/rebuildextendeddn3
-rwxr-xr-xsource4/scripting/bin/upgradeschema.py5
2 files changed, 5 insertions, 3 deletions
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,