summaryrefslogtreecommitdiff
path: root/source4/scripting/bin/upgradeprovision
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-05-20 19:43:19 +0400
committerMatthieu Patou <mat@samba.org>2011-05-21 08:41:07 +0200
commit6071ed67bf413b0f9245be9038e2e600d8ebb5aa (patch)
tree3abb8229d829395b2aee32804018c3335e6fc685 /source4/scripting/bin/upgradeprovision
parent4360c5bf276aa958864254ee22b3a3d4a4560381 (diff)
downloadsamba-6071ed67bf413b0f9245be9038e2e600d8ebb5aa.tar.gz
samba-6071ed67bf413b0f9245be9038e2e600d8ebb5aa.tar.bz2
samba-6071ed67bf413b0f9245be9038e2e600d8ebb5aa.zip
s4-python: move function find_provision_key_parameters to provision namespace as it can be used not only for upgradeprovision
Diffstat (limited to 'source4/scripting/bin/upgradeprovision')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 4e48a48b45..e58a2647b6 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -44,7 +44,7 @@ from ldb import (SCOPE_SUBTREE, SCOPE_BASE,
FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE,
MessageElement, Message, Dn)
from samba import param, dsdb, Ldb
-from samba.provision import (get_domain_descriptor,
+from samba.provision import (get_domain_descriptor, find_provision_key_parameters,
get_config_descriptor,
ProvisioningError, get_last_provision_usn,
get_max_usn, update_provision_usn, setup_path)
@@ -52,7 +52,7 @@ from samba.schema import get_linked_attributes, Schema, get_schema_descriptor
from samba.dcerpc import security, drsblobs, xattr
from samba.ndr import ndr_unpack
from samba.upgradehelpers import (dn_sort, get_paths, newprovision,
- find_provision_key_parameters, get_ldbs,
+ get_ldbs,
usn_in_range, identic_rename, get_diff_sddls,
update_secrets, CHANGE, ERROR, SIMPLE,
CHANGEALL, GUESS, CHANGESD, PROVISION,