sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00
Code Activity

python: Use generated WERROR definitions

Browse Source 
Previously we either defined WERRORs locally or compared them against
strings where we needed to use them.

Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Bob Campbell
2017-02-13 11:12:54 +13:00
committed by Andrew Bartlett
parent c6dcac954e
commit 2a5d9e61db
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/remove_dc.py
View File

@ -19,6 +19,7 @@
import uuid
import ldb
from ldb import LdbError
from samba import werror
from samba.ndr import ndr_unpack
from samba.dcerpc import misc, dnsp
from samba.dcerpc.dnsp import DNS_TYPE_NS, DNS_TYPE_A, DNS_TYPE_AAAA, \
@ -98,7 +99,7 @@ def remove_dns_references(samdb, logger, dnsHostName):
try:
primary_recs = samdb.dns_lookup(dnsHostName)
except RuntimeError as (enum, estr):
if enum == 0x000025F2: #WERR_DNS_ERROR_NAME_DOES_NOT_EXIST
if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
return
raise DemoteException("lookup of %s failed: %s" % (dnsHostName, estr))
samdb.dns_replace(dnsHostName, [])
@ -141,7 +142,7 @@ def remove_dns_references(samdb, logger, dnsHostName):
logger.debug("checking for DNS records to remove on %s" % a_name)
a_recs = samdb.dns_lookup(a_name)
except RuntimeError as (enum, estr):
if enum == 0x000025F2: #WERR_DNS_ERROR_NAME_DOES_NOT_EXIST
if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
return
raise DemoteException("lookup of %s failed: %s" % (a_name, estr))