sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

samba-tool domain demote: Add --verbose and --quiet options

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett
2015-10-16 13:47:29 +13:00
parent 642de9193f
commit e57dcddfe8
3 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
python/samba/netcmd/domain.py
View File

@ -672,6 +672,8 @@ class cmd_domain_demote(Command):
Option("-H", "--URL", help="LDB URL for database or target server", type=str, Option("-H", "--URL", help="LDB URL for database or target server", type=str,
metavar="URL", dest="H"), metavar="URL", dest="H"),
Option("--remove-other-dead-server", help="Dead DC to remove ALL references to (rather than this DC)", type=str), Option("--remove-other-dead-server", help="Dead DC to remove ALL references to (rather than this DC)", type=str),
Option("--quiet", help="Be quiet", action="store_true"),
Option("--verbose", help="Be verbose", action="store_true"),
] ]
takes_optiongroups = { takes_optiongroups = {
@ -682,11 +684,20 @@ class cmd_domain_demote(Command):
def run(self, sambaopts=None, credopts=None, def run(self, sambaopts=None, credopts=None,
versionopts=None, server=None, versionopts=None, server=None,
remove_other_dead_server=None, H=None): remove_other_dead_server=None, H=None,
verbose=False, quiet=False):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
net = Net(creds, lp, server=credopts.ipaddress) net = Net(creds, lp, server=credopts.ipaddress)
logger = self.get_logger()
if verbose:
logger.setLevel(logging.DEBUG)
elif quiet:
logger.setLevel(logging.WARNING)
else:
logger.setLevel(logging.INFO)
if remove_other_dead_server is not None: if remove_other_dead_server is not None:
if server is not None: if server is not None:
samdb = SamDB(url="ldap://%s" % server, samdb = SamDB(url="ldap://%s" % server,
@ -695,7 +706,7 @@ class cmd_domain_demote(Command):
else: else:
samdb = SamDB(url=H, session_info=system_session(), credentials=creds, lp=lp) samdb = SamDB(url=H, session_info=system_session(), credentials=creds, lp=lp)
try: try:
remove_dc.remove_dc(samdb, remove_other_dead_server) remove_dc.remove_dc(samdb, logger, remove_other_dead_server)
except remove_dc.DemoteException as err: except remove_dc.DemoteException as err:
raise CommandError("Demote failed: %s" % err) raise CommandError("Demote failed: %s" % err)
return return

55
python/samba/remove_dc.py
View File

@ -33,7 +33,7 @@ class DemoteException(Exception):
return "DemoteException: " + self.value return "DemoteException: " + self.value
def remove_sysvol_references(samdb, dc_name): def remove_sysvol_references(samdb, logger, dc_name):
# DNs under the Configuration DN: # DNs under the Configuration DN:
realm = samdb.domain_dns_name() realm = samdb.domain_dns_name()
for s in ("CN=Enterprise,CN=Microsoft System Volumes,CN=System", for s in ("CN=Enterprise,CN=Microsoft System Volumes,CN=System",
@ -50,6 +50,7 @@ def remove_sysvol_references(samdb, dc_name):
% (dn)) % (dn))
dn.set_component(0, "CN", dc_name) dn.set_component(0, "CN", dc_name)
try: try:
logger.info("Removing Sysvol reference: %s" % dn)
samdb.delete(dn) samdb.delete(dn)
except ldb.LdbError as (enum, estr): except ldb.LdbError as (enum, estr):
if enum == ldb.ERR_NO_SUCH_OBJECT: if enum == ldb.ERR_NO_SUCH_OBJECT:
@ -70,7 +71,9 @@ def remove_sysvol_references(samdb, dc_name):
raise DemoteException("Failed constructing DN %s by adding child %s"\ raise DemoteException("Failed constructing DN %s by adding child %s"\
% (dn, rdn)) % (dn, rdn))
dn.set_component(0, "CN", dc_name) dn.set_component(0, "CN", dc_name)
try: try:
logger.info("Removing Sysvol reference: %s" % dn)
samdb.delete(dn) samdb.delete(dn)
except ldb.LdbError as (enum, estr): except ldb.LdbError as (enum, estr):
if enum == ldb.ERR_NO_SUCH_OBJECT: if enum == ldb.ERR_NO_SUCH_OBJECT:
@ -79,7 +82,7 @@ def remove_sysvol_references(samdb, dc_name):
raise raise
def remove_dns_references(samdb, dnsHostName): def remove_dns_references(samdb, logger, dnsHostName):
# Check we are using in-database DNS # Check we are using in-database DNS
zones = samdb.search(base="", scope=ldb.SCOPE_SUBTREE, zones = samdb.search(base="", scope=ldb.SCOPE_SUBTREE,
@ -145,8 +148,8 @@ def remove_dns_references(samdb, dnsHostName):
a_recs = [ r for r in a_recs if not a_rec_to_remove(r) ] a_recs = [ r for r in a_recs if not a_rec_to_remove(r) ]
if len(a_recs) != orig_num_recs: if len(a_recs) != orig_num_recs:
print "updating %s keeping %d values, removing %s values" % \ logger.info("updating %s keeping %d values, removing %s values" % \
(a_name, len(a_recs), orig_num_recs - len(a_recs)) (a_name, len(a_recs), orig_num_recs - len(a_recs)))
samdb.dns_replace(a_name, a_recs) samdb.dns_replace(a_name, a_recs)
# Find all the CNAME, NS, PTR and SRV records that point at the # Find all the CNAME, NS, PTR and SRV records that point at the
@ -165,7 +168,7 @@ def remove_dns_references(samdb, dnsHostName):
return False return False
for zone in zones: for zone in zones:
print "checking %s" % zone.dn logger.debug("checking %s" % zone.dn)
records = samdb.search(base=zone.dn, scope=ldb.SCOPE_SUBTREE, records = samdb.search(base=zone.dn, scope=ldb.SCOPE_SUBTREE,
expression="(&(objectClass=dnsNode)" expression="(&(objectClass=dnsNode)"
"(!(dNSTombstoned=TRUE)))", "(!(dNSTombstoned=TRUE)))",
@ -182,14 +185,16 @@ def remove_dns_references(samdb, dnsHostName):
for v in values if not to_remove(v) ] for v in values if not to_remove(v) ]
if len(values) != orig_num_values: if len(values) != orig_num_values:
print "updating %s keeping %d values, removing %s values" \ logger.info("updating %s keeping %d values, removing %s values" \
% (record.dn, len(values), orig_num_values - len(values)) % (record.dn, len(values),
orig_num_values - len(values)))
# This requires the values to be unpacked, so this # This requires the values to be unpacked, so this
# has been done in the list comprehension above # has been done in the list comprehension above
samdb.dns_replace_by_dn(record.dn, values) samdb.dns_replace_by_dn(record.dn, values)
def offline_remove_server(samdb, server_dn, def offline_remove_server(samdb, logger,
server_dn,
remove_computer_obj=False, remove_computer_obj=False,
remove_server_obj=False, remove_server_obj=False,
remove_sysvol_obj=False, remove_sysvol_obj=False,
@ -231,12 +236,17 @@ def offline_remove_server(samdb, server_dn,
"cn"], "cn"],
scope=ldb.SCOPE_BASE) scope=ldb.SCOPE_BASE)
if "rIDSetReferences" in computer_msgs[0]: if "rIDSetReferences" in computer_msgs[0]:
samdb.delete(computer_msgs[0]["rIDSetReferences"][0]) rid_set_dn = str(computer_msgs[0]["rIDSetReferences"][0])
logger.info("Removing RID Set: %s" % rid_set_dn)
samdb.delete(rid_set_dn)
if "msDS-KrbTgtLink" in computer_msgs[0]: if "msDS-KrbTgtLink" in computer_msgs[0]:
samdb.delete(computer_msgs[0]["msDS-KrbTgtLink"][0]) krbtgt_link_dn = str(computer_msgs[0]["msDS-KrbTgtLink"][0])
logger.info("Removing RODC KDC account: %s" % krbtgt_link_dn)
samdb.delete(krbtgt_link_dn)
if remove_computer_obj: if remove_computer_obj:
# Delete the computer tree # Delete the computer tree
logger.info("Removing computer account: %s (and any child objects)" % computer_dn)
samdb.delete(computer_dn, ["tree_delete:0"]) samdb.delete(computer_dn, ["tree_delete:0"])
if "dnsHostName" in msgs[0]: if "dnsHostName" in msgs[0]:
@ -248,15 +258,18 @@ def offline_remove_server(samdb, server_dn,
attrs=[], scope=ldb.SCOPE_SUBTREE, attrs=[], scope=ldb.SCOPE_SUBTREE,
base=samdb.get_default_basedn()) base=samdb.get_default_basedn())
if len(res) == 1: if len(res) == 1:
logger.info("Removing Samba-specific DNS service account: %s" % res[0].dn)
samdb.delete(res[0].dn) samdb.delete(res[0].dn)
if dnsHostName is not None and remove_dns_names: if dnsHostName is not None and remove_dns_names:
remove_dns_references(samdb, dnsHostName) remove_dns_references(samdb, logger, dnsHostName)
if remove_sysvol_obj: if remove_sysvol_obj:
remove_sysvol_references(samdb, dc_name) remove_sysvol_references(samdb, logger, dc_name)
def offline_remove_ntds_dc(samdb, ntds_dn, def offline_remove_ntds_dc(samdb,
logger,
ntds_dn,
remove_computer_obj=False, remove_computer_obj=False,
remove_server_obj=False, remove_server_obj=False,
remove_connection_obj=False, remove_connection_obj=False,
@ -301,6 +314,7 @@ def offline_remove_ntds_dc(samdb, ntds_dn,
expression="(&(objectclass=nTDSConnection)" expression="(&(objectclass=nTDSConnection)"
"(fromServer=<GUID=%s>))" % ntds_guid) "(fromServer=<GUID=%s>))" % ntds_guid)
for conn in stale_connections: for conn in stale_connections:
logger.info("Removing nTDSConnection: %s" % conn.dn)
samdb.delete(conn.dn) samdb.delete(conn.dn)
if seize_stale_fsmo: if seize_stale_fsmo:
@ -316,16 +330,19 @@ def offline_remove_ntds_dc(samdb, ntds_dn,
m.dn = role.dn m.dn = role.dn
m['value'] = ldb.MessageElement(val, ldb.FLAG_MOD_REPLACE, m['value'] = ldb.MessageElement(val, ldb.FLAG_MOD_REPLACE,
'fsmoRoleOwner') 'fsmoRoleOwner')
logger.warning("Seizing FSMO role on: %s (now owned by %s)"
% (role.dn, my_serviceName))
samdb.modify(m) samdb.modify(m)
# Remove the NTDS setting tree # Remove the NTDS setting tree
try: try:
logger.info("Removing nTDSDSA: %s (and any children)" % ntds_dn)
samdb.delete(ntds_dn, ["tree_delete:0"]) samdb.delete(ntds_dn, ["tree_delete:0"])
except LdbError as (enum, estr): except LdbError as (enum, estr):
raise DemoteException("Failed to remove the DCs NTDS DSA object: %s" raise DemoteException("Failed to remove the DCs NTDS DSA object: %s"
% estr) % estr)
offline_remove_server(samdb, server_dn, offline_remove_server(samdb, logger, server_dn,
remove_computer_obj=remove_computer_obj, remove_computer_obj=remove_computer_obj,
remove_server_obj=remove_server_obj, remove_server_obj=remove_server_obj,
remove_sysvol_obj=remove_sysvol_obj, remove_sysvol_obj=remove_sysvol_obj,
@ -333,7 +350,7 @@ def offline_remove_ntds_dc(samdb, ntds_dn,
remove_dns_account=remove_dns_account) remove_dns_account=remove_dns_account)
def remove_dc(samdb, dc_name): def remove_dc(samdb, logger, dc_name):
# TODO: Check if this is the last server (covered mostly by # TODO: Check if this is the last server (covered mostly by
# refusing to remove our own name) # refusing to remove our own name)
@ -358,7 +375,8 @@ def remove_dc(samdb, dc_name):
expression="(objectClass=ntdsdsa)") expression="(objectClass=ntdsdsa)")
except LdbError as (enum, estr): except LdbError as (enum, estr):
if enum == ldb.ERR_NO_SUCH_OBJECT: if enum == ldb.ERR_NO_SUCH_OBJECT:
offline_remove_server(samdb, msgs[0].dn, offline_remove_server(samdb, logger,
msgs[0].dn,
remove_computer_obj=True, remove_computer_obj=True,
remove_server_obj=True, remove_server_obj=True,
remove_sysvol_obj=True, remove_sysvol_obj=True,
@ -370,7 +388,8 @@ def remove_dc(samdb, dc_name):
else: else:
pass pass
offline_remove_ntds_dc(samdb, msgs[0].dn, offline_remove_ntds_dc(samdb, logger,
msgs[0].dn,
remove_computer_obj=True, remove_computer_obj=True,
remove_server_obj=True, remove_server_obj=True,
remove_connection_obj=True, remove_connection_obj=True,
@ -387,6 +406,6 @@ def offline_remove_dc_RemoveDsServer(samdb, ntds_dn):
samdb.start_transaction() samdb.start_transaction()
offline_remove_ntds_dc(samdb, ntds_dn) offline_remove_ntds_dc(samdb, ntds_dn, None)
samdb.commit_transaction() samdb.commit_transaction()

2
python/samba/tests/kcc/ldif_import_export.py
View File

@ -25,7 +25,7 @@ import time
import shutil import shutil
import sys import sys
import subprocess import subprocess
import logging
import samba.tests import samba.tests
from samba.kcc import ldif_import_export, KCC from samba.kcc import ldif_import_export, KCC
from samba import ldb from samba import ldb