diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-03-22 16:19:27 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-03-25 10:33:37 +0100 |
| commit | 9040e2684161ce75738e9da0fee191aa34858607 (patch) | |
| tree | d5e2b7f583feec8492f1ba422f9ccf60a2081a4a /source4/scripting/bin | |
| parent | a113ddbf881c5905bbf7072638c7ba8843eeb85e (diff) | |
| download | samba-9040e2684161ce75738e9da0fee191aa34858607.tar.gz samba-9040e2684161ce75738e9da0fee191aa34858607.tar.bz2 samba-9040e2684161ce75738e9da0fee191aa34858607.zip | |
scripting: Move get_diff_sds from samba.upgradehelpers to samba.descriptor
This helps avoid a dependency loop when we use get_diff_sds in dbcheck.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/scripting/bin')
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index 92d577391e..88e0206e59 100755 --- a/source4/scripting/bin/samba_upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision @@ -46,7 +46,7 @@ from ldb import (SCOPE_SUBTREE, SCOPE_BASE, MessageElement, Message, Dn, LdbError) from samba import param, dsdb, Ldb from samba.common import confirm -from samba.descriptor import get_wellknown_sds, get_empty_descriptor +from samba.descriptor import get_wellknown_sds, get_empty_descriptor, get_diff_sds from samba.provision import (find_provision_key_parameters, ProvisioningError, get_last_provision_usn, get_max_usn, update_provision_usn, setup_path) @@ -57,7 +57,7 @@ from samba.dcerpc.security import ( from samba.ndr import ndr_unpack from samba.upgradehelpers import (dn_sort, get_paths, newprovision, get_ldbs, findprovisionrange, - usn_in_range, identic_rename, get_diff_sds, + usn_in_range, identic_rename, update_secrets, CHANGE, ERROR, SIMPLE, CHANGEALL, GUESS, CHANGESD, PROVISION, updateOEMInfo, getOEMInfo, update_gpo, |