netcmd: domain: move domain_backup.py to domain/backup.py

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/domain/__init__.py b/python/samba/netcmd/domain/__init__.py
index 690998474bf060bd60033199b733e9308b28d0da..5edeec7cf30673fb7c66f36eebfd862214b27d93 100644 (file)
--- a/python/samba/netcmd/domain/__init__.py
+++ b/python/samba/netcmd/domain/__init__.py
@@ -101,12 +101,13 @@ from samba.provision.common import (
 )
 
 from samba.netcmd.pso import cmd_domain_passwordsettings_pso
-from samba.netcmd.domain_backup import cmd_domain_backup
 
 from samba.common import get_string
 from samba.trust_utils import CreateTrustedDomainRelax
 from samba import dsdb
 
+from .backup import cmd_domain_backup
+
 string_version_to_constant = {
     "2000": DS_DOMAIN_FUNCTION_2000,
     "2003": DS_DOMAIN_FUNCTION_2003,

diff --git a/python/samba/netcmd/domain_backup.py b/python/samba/netcmd/domain/backup.py
similarity index 99%
rename from python/samba/netcmd/domain_backup.py
rename to python/samba/netcmd/domain/backup.py
index 9eaba7dea1dab361325c8eeaccf72d6b62c98c91..fe667c85632a614daceb7742413efd1b88aac940 100644 (file)
--- a/python/samba/netcmd/domain_backup.py
+++ b/python/samba/netcmd/domain/backup.py
@@ -36,7 +36,7 @@ from samba.dcerpc.security import dom_sid
 from samba.netcmd import Option, CommandError
 from samba.dcerpc import misc, security, drsblobs
 from samba import Ldb
-from . fsmo import cmd_fsmo_seize
+from samba.netcmd.fsmo import cmd_fsmo_seize
 from samba.provision import make_smbconf, DEFAULTSITE
 from samba.upgradehelpers import update_krbtgt_account_password
 from samba.remove_dc import remove_dc