sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

pydns: Also return the DN of the LDB object when finding a DNS record

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 2017-02-27 17:09:56 +13:00
parent 9186cc7143
commit e7bc974333
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/remove_dc.py
View File

@ -97,7 +97,7 @@ def remove_dns_references(samdb, logger, dnsHostName):
dnsHostNameUpper = dnsHostName.upper()
try:
primary_recs = samdb.dns_lookup(dnsHostName)
(dn, primary_recs) = samdb.dns_lookup(dnsHostName)
except RuntimeError as (enum, estr):
if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
return
@ -140,7 +140,7 @@ def remove_dns_references(samdb, logger, dnsHostName):
for a_name in a_names_to_remove_from:
try:
logger.debug("checking for DNS records to remove on %s" % a_name)
a_recs = samdb.dns_lookup(a_name)
(a_rec_dn, a_recs) = samdb.dns_lookup(a_name)
except RuntimeError as (enum, estr):
if enum == werror.WERR_DNS_ERROR_NAME_DOES_NOT_EXIST:
return

5
source4/dns_server/pydns.c
View File

@ -105,7 +105,7 @@ static int py_dnsp_DnssrvRpcRecord_get_array(PyObject *value,
static PyObject *py_dsdb_dns_lookup(PyObject *self, PyObject *args)
{
struct ldb_context *samdb;
PyObject *py_ldb;
PyObject *py_ldb, *ret, *pydn;
char *dns_name;
TALLOC_CTX *frame;
NTSTATUS status;
@ -149,8 +149,9 @@ static PyObject *py_dsdb_dns_lookup(PyObject *self, PyObject *args)
}
ret = py_dnsp_DnssrvRpcRecord_get_list(records, num_records);
pydn = pyldb_Dn_FromDn(dn);
talloc_free(frame);
return ret;
return Py_BuildValue("(OO)", pydn, ret);
}
static PyObject *py_dsdb_dns_extract(PyObject *self, PyObject *args)