sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-06 17:44:20 +03:00
Code Activity

python: Handle LdbError thrown from functions operating on DNs

Browse Source 
None of these functions can return False now. Instead we must catch the
LdbError if we want to perform further error handling.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton
2022-09-30 11:50:30 +13:00
committed by Andrew Bartlett
parent a68428a951
commit 12677ff65e
7 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/samba/remove_dc.py
View File

@@ -45,10 +45,14 @@ def remove_sysvol_references(samdb, logger, dc_name):
# 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:
try:
dn.add_base(samdb.get_config_basedn())
except ldb.LdbError:
raise DemoteException("Failed constructing DN %s by adding base %s"
% (dn, samdb.get_config_basedn()))
if dn.add_child("CN=X") == False:
try:
dn.add_child("CN=X")
except ldb.LdbError:
raise DemoteException("Failed constructing DN %s by adding child CN=X"
% (dn))
dn.set_component(0, "CN", dc_name)
@@ -68,10 +72,14 @@ def remove_sysvol_references(samdb, logger, dc_name):
# This is verbose, but it is the safe, escape-proof way
# to add a base and add an arbitrary RDN.
dn = ldb.Dn(samdb, s)
if dn.add_base(samdb.get_default_basedn()) == False:
try:
dn.add_base(samdb.get_default_basedn())
except ldb.LdbError:
raise DemoteException("Failed constructing DN %s by adding base %s"
% (dn, samdb.get_default_basedn()))
if dn.add_child("CN=X") == False:
try:
dn.add_child("CN=X")
except ldb.LdbError:
raise DemoteException("Failed constructing DN %s by adding child "
"CN=X (soon to be CN=%s)" % (dn, dc_name))
dn.set_component(0, "CN", dc_name)