diff options
| -rw-r--r-- | python/samba/descriptor.py (renamed from python/samba/provision/descriptor.py) | 0 | ||||
| -rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
| -rw-r--r-- | python/samba/provision/sambadns.py | 2 | ||||
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/python/samba/provision/descriptor.py b/python/samba/descriptor.py index 9916a22e5e..9916a22e5e 100644 --- a/python/samba/provision/descriptor.py +++ b/python/samba/descriptor.py diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index aac0ee36b2..ee4cc10dca 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -76,7 +76,7 @@ from samba.provision.backend import ( LDBBackend, OpenLDAPBackend, ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_empty_descriptor, get_config_descriptor, get_config_partitions_descriptor, diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index 4522683fe8..a5a45cf494 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -36,7 +36,7 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2 ) -from samba.provision.descriptor import ( +from samba.descriptor import ( get_domain_descriptor, get_domain_delete_protected1_descriptor, get_domain_delete_protected2_descriptor, diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index c6fc8f26e0..c0ce040801 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.provision.descriptor import get_wellknown_sds, get_empty_descriptor +from samba.descriptor import get_wellknown_sds, get_empty_descriptor from samba.provision import (find_provision_key_parameters, ProvisioningError, get_last_provision_usn, get_max_usn, update_provision_usn, setup_path) |