sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

scripting: Make tdb_copy a common util function in samba.tdb_util

Browse Source 
This will allow samba_upgradeprovision to also call it.

Andrew Bartlett

Reviewed-by: Matthieu Patou <mat@samba.org>
This commit is contained in:
Andrew Bartlett 2013-02-17 18:14:06 +11:00
parent 2c2759e408
commit 396df64ef6
3 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/scripting/bin/samba_upgradeprovision
View File

@ -40,6 +40,7 @@ import samba.getopt as options
from base64 import b64encode
from samba.credentials import DONT_USE_KERBEROS
from samba.auth import system_session, admin_session
from samba import tdb_util
from ldb import (SCOPE_SUBTREE, SCOPE_BASE,
FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE,
MessageElement, Message, Dn, LdbError)

21
source4/scripting/python/samba/provision/sambadns.py
View File

@ -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
"""

41
source4/scripting/python/samba/tdb_util.py Normal file
View File

@ -0,0 +1,41 @@
# Unix SMB/CIFS implementation.
# tdb util helpers
#
# Copyright (C) Kai Blin <kai@samba.org> 2011
# Copyright (C) Amitay Isaacs <amitay@gmail.com> 2011
# Copyright (C) Andrew Bartlett <abartlet@samba.org> 2013
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import samba
import subprocess
import os
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)