From 396df64ef6f2c66c35989ecda3e564d5578fe9f3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 17 Feb 2013 18:14:06 +1100 Subject: scripting: Make tdb_copy a common util function in samba.tdb_util This will allow samba_upgradeprovision to also call it. Andrew Bartlett Reviewed-by: Matthieu Patou --- .../scripting/python/samba/provision/sambadns.py | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'source4/scripting/python/samba/provision/sambadns.py') diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py index 21675113d6b..4522683fe8b 100644 --- a/source4/scripting/python/samba/provision/sambadns.py +++ b/source4/scripting/python/samba/provision/sambadns.py @@ -27,7 +27,7 @@ import time import ldb from base64 import b64encode import samba -import subprocess +from samba.tdb_util import tdb_copy from samba.ndr import ndr_pack, ndr_unpack from samba import setup_file from samba.dcerpc import dnsp, misc, security @@ -739,25 +739,6 @@ def create_zone_file(lp, logger, paths, targetdir, dnsdomain, os.system(rndc + " unfreeze " + lp.get("realm")) -def tdb_copy(file1, file2): - """Copy tdb file using tdbbackup utility and rename it - """ - # Find the location of tdbbackup tool - dirs = ["bin", samba.param.bin_dir()] + os.getenv('PATH').split(os.pathsep) - for d in dirs: - toolpath = os.path.join(d, "tdbbackup") - if os.path.exists(toolpath): - break - - tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1] - status = subprocess.call(tdbbackup_cmd, close_fds=True, shell=False) - - if status == 0: - os.rename("%s.copy.tdb" % file1, file2) - else: - raise Exception("Error copying %s" % file1) - - def create_samdb_copy(samdb, logger, paths, names, domainsid, domainguid): """Create a copy of samdb and give write permissions to named for dns partitions """ -- cgit