sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

scripting: Move samba.provision.descriptor to samba.descriptor

Browse Source 
This will allow dbcheck to import it, without a cirucular dependency via
samba.provision importing dbcheck.

Andrew Bartlett

Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2013-03-21 13:34:26 +11:00 committed by Stefan Metzmacher
parent e81a97dd6f
commit 352aff8ed7
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
python/samba/provision/descriptor.py → python/samba/descriptor.py
View File

2
python/samba/provision/__init__.py
View File

@ -76,7 +76,7 @@ from samba.provision.backend import (
LDBBackend, LDBBackend,
OpenLDAPBackend, OpenLDAPBackend,
) )
from samba.provision.descriptor import ( from samba.descriptor import (
get_empty_descriptor, get_empty_descriptor,
get_config_descriptor, get_config_descriptor,
get_config_partitions_descriptor, get_config_partitions_descriptor,

2
python/samba/provision/sambadns.py
View File

@ -36,7 +36,7 @@ from samba.dsdb import (
DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2003,
DS_DOMAIN_FUNCTION_2008_R2 DS_DOMAIN_FUNCTION_2008_R2
) )
from samba.provision.descriptor import ( from samba.descriptor import (
get_domain_descriptor, get_domain_descriptor,
get_domain_delete_protected1_descriptor, get_domain_delete_protected1_descriptor,
get_domain_delete_protected2_descriptor, get_domain_delete_protected2_descriptor,

2
source4/scripting/bin/samba_upgradeprovision
View File

@ -46,7 +46,7 @@ from ldb import (SCOPE_SUBTREE, SCOPE_BASE,
MessageElement, Message, Dn, LdbError) MessageElement, Message, Dn, LdbError)
from samba import param, dsdb, Ldb from samba import param, dsdb, Ldb
from samba.common import confirm 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, from samba.provision import (find_provision_key_parameters,
ProvisioningError, get_last_provision_usn, ProvisioningError, get_last_provision_usn,
get_max_usn, update_provision_usn, setup_path) get_max_usn, update_provision_usn, setup_path)