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)
samdb.delete(dn)
- except ldb.LdbError as (enum, estr):
+ except ldb.LdbError as e:
+ (enum, estr) = e.args
if enum == ldb.ERR_NO_SUCH_OBJECT:
pass
else:
# 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 "
try:
logger.info("Removing Sysvol reference: %s" % dn)
samdb.delete(dn)
- except ldb.LdbError as (enum, estr):
+ except ldb.LdbError as e1:
+ (enum, estr) = e1.args
if enum == ldb.ERR_NO_SUCH_OBJECT:
pass
else:
try:
(dn, primary_recs) = samdb.dns_lookup(dnsHostName)
- except RuntimeError as (enum, estr):
- if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
+ except RuntimeError as e4:
+ (enum, estr) = e4.args
+ 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,
# By using a set here, duplicates via (eg) example.com/Configuration
# do not matter, they become just example.com
a_names_to_remove_from \
- = set(dns_name_from_dn(dn) for dn in ncs)
+ = set(dns_name_from_dn(str(dn)) for dn in ncs)
def a_rec_to_remove(dnsRecord):
if dnsRecord.wType == DNS_TYPE_A or dnsRecord.wType == DNS_TYPE_AAAA:
try:
logger.debug("checking for DNS records to remove on %s" % a_name)
(a_rec_dn, a_recs) = samdb.dns_lookup(a_name)
- except RuntimeError as (enum, estr):
+ except RuntimeError as e2:
+ (enum, estr) = e2.args
if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
return
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)))
dc_name = str(msgs[0]["cn"][0])
try:
- computer_dn = ldb.Dn(samdb, msgs[0]["serverReference"][0])
+ computer_dn = ldb.Dn(samdb, msgs[0]["serverReference"][0].decode('utf8'))
except KeyError:
computer_dn = None
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,
res = samdb.search("",
scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
assert len(res) == 1
- my_serviceName = ldb.Dn(samdb, res[0]["dsServiceName"][0])
+ my_serviceName = ldb.Dn(samdb, res[0]["dsServiceName"][0].decode('utf8'))
server_dn = ntds_dn.parent()
if my_serviceName == ntds_dn:
try:
msgs = samdb.search(base=ntds_dn, expression="objectClass=ntdsDSA",
- attrs=["objectGUID"], scope=ldb.SCOPE_BASE)
- except LdbError as (enum, estr):
+ 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):
try:
logger.info("Removing nTDSDSA: %s (and any children)" % ntds_dn)
samdb.delete(ntds_dn, ["tree_delete:0"])
- except LdbError as (enum, estr):
+ except LdbError as e6:
+ (enum, estr) = e6.args
raise DemoteException("Failed to remove the DCs NTDS DSA object: %s"
% estr)
attrs=[],
expression="(&(objectClass=server)"
"(cn=%s))"
- % ldb.binary_encode(dc_name))
- except LdbError as (enum, estr):
+ % ldb.binary_encode(dc_name))
+ except LdbError as e3:
+ (enum, estr) = e3.args
raise DemoteException("Failure checking if %s is an server "
"object in %s: "
% (dc_name, samdb.domain_dns_name()), estr)
if (len(server_msgs) == 0):
+ samdb.transaction_cancel()
raise DemoteException("%s is not an AD DC in %s"
% (dc_name, samdb.domain_dns_name()))
server_dn = server_msgs[0].dn
try:
ntds_msgs = samdb.search(base=ntds_dn, attrs=[], scope=ldb.SCOPE_BASE,
expression="(objectClass=ntdsdsa)")
- except LdbError as (enum, estr):
+ except LdbError as e7:
+ (enum, estr) = e7.args
if enum == ldb.ERR_NO_SUCH_OBJECT:
ntds_msgs = []
pass
else:
+ samdb.transaction_cancel()
raise DemoteException("Failure checking if %s is an NTDS DSA in %s: "
% (ntds_dn, samdb.domain_dns_name()), estr)
# object, just remove the server object located above
if (len(ntds_msgs) == 0):
if server_dn is None:
+ samdb.transaction_cancel()
raise DemoteException("%s is not an AD DC in %s"
% (dc_name, samdb.domain_dns_name()))
samdb.transaction_commit()
-
def offline_remove_dc_RemoveDsServer(samdb, ntds_dn):
samdb.start_transaction()
git.samba.org / nivanova / samba-autobuild / .git / blobdiff