from samba.dcerpc.dnsp import DNS_TYPE_NS, DNS_TYPE_A, DNS_TYPE_AAAA, \
DNS_TYPE_CNAME, DNS_TYPE_SRV, DNS_TYPE_PTR
+
class DemoteException(Exception):
"""Base element for demote errors"""
# This is verbose, but it is the safe, escape-proof way
# to add a base and add an arbitrary RDN.
if dn.add_base(samdb.get_config_basedn()) == False:
- raise DemoteException("Failed constructing DN %s by adding base %s" \
+ raise DemoteException("Failed constructing DN %s by adding base %s"
% (dn, samdb.get_config_basedn()))
if dn.add_child("CN=X") == False:
- raise DemoteException("Failed constructing DN %s by adding child CN=X"\
- % (dn))
+ raise DemoteException("Failed constructing DN %s by adding child CN=X"
+ % (dn))
dn.set_component(0, "CN", dc_name)
try:
logger.info("Removing Sysvol reference: %s" % dn)
# to add a base and add an arbitrary RDN.
dn = ldb.Dn(samdb, s)
if dn.add_base(samdb.get_default_basedn()) == False:
- raise DemoteException("Failed constructing DN %s by adding base" % \
+ raise DemoteException("Failed constructing DN %s by adding base" %
(dn, samdb.get_default_basedn()))
if dn.add_child("CN=X") == False:
raise DemoteException("Failed constructing DN %s by adding child "
(dn, primary_recs) = samdb.dns_lookup(dnsHostName)
except RuntimeError as e4:
(enum, estr) = e4.args
- if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
+ if (enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST or
+ enum == werror.WERR_DNS_ERROR_RCODE_NAME_ERROR):
if ignore_no_name:
remove_hanging_dns_references(samdb, logger,
dnsHostNameUpper,
raise DemoteException("lookup of %s failed: %s" % (a_name, estr))
orig_num_recs = len(a_recs)
- 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:
- logger.info("updating %s keeping %d values, removing %s values" % \
- (a_name, len(a_recs), orig_num_recs - len(a_recs)))
+ logger.info("updating %s keeping %d values, removing %s values" %
+ (a_name, len(a_recs), orig_num_recs - len(a_recs)))
samdb.dns_replace(a_name, a_recs)
remove_hanging_dns_references(samdb, logger, dnsHostNameUpper, zones)
continue
# Remove references to dnsHostName in A, AAAA, NS, CNAME and SRV
- values = [ ndr_unpack(dnsp.DnssrvRpcRecord, v)
- for v in orig_values if not to_remove(v) ]
+ values = [ndr_unpack(dnsp.DnssrvRpcRecord, v)
+ for v in orig_values if not to_remove(v)]
if len(values) != len(orig_values):
- logger.info("updating %s keeping %d values, removing %s values" \
+ logger.info("updating %s keeping %d values, removing %s values"
% (record.dn, len(values),
len(orig_values) - len(values)))
dnsHostName = None
if remove_server_obj:
- # Remove the server DN
- samdb.delete(server_dn)
+ # Remove the server DN (do a tree-delete as it could still have a
+ # 'DNS Settings' child object if it's a Windows DC)
+ samdb.delete(server_dn, ["tree_delete:0"])
if computer_dn is not None:
computer_msgs = samdb.search(base=computer_dn,
if remove_sysvol_obj:
remove_sysvol_references(samdb, logger, dc_name)
+
def offline_remove_ntds_dc(samdb,
logger,
ntds_dn,
try:
msgs = samdb.search(base=ntds_dn, expression="objectClass=ntdsDSA",
- attrs=["objectGUID"], scope=ldb.SCOPE_BASE)
+ attrs=["objectGUID"], scope=ldb.SCOPE_BASE)
except LdbError as e5:
(enum, estr) = e5.args
if enum == ldb.ERR_NO_SUCH_OBJECT:
- raise DemoteException("Given DN %s doesn't exist" % ntds_dn)
+ raise DemoteException("Given DN %s doesn't exist" % ntds_dn)
else:
raise
if (len(msgs) == 0):
attrs=[],
expression="(&(objectClass=server)"
"(cn=%s))"
- % ldb.binary_encode(dc_name))
+ % ldb.binary_encode(dc_name))
except LdbError as e3:
(enum, estr) = e3.args
raise DemoteException("Failure checking if %s is an server "
samdb.transaction_commit()
-
def offline_remove_dc_RemoveDsServer(samdb, ntds_dn):
samdb.start_transaction()