Attachment #8845 for bug #41190




        '''Return the NDR database structures from a dnsRecord element'''
        return dsdb_dns.extract(el)

    def dns_replace(self, dns_name, new_records, tombstone=False):
        '''Do a DNS modification on the database, sets the NDR database
        structures on a DNS name
        '''
        return dsdb_dns.replace(self, dns_name, new_records, tombstone)

    def dns_replace_by_dn(self, dn, new_records, tombstone=False):
        '''Do a DNS modification on the database, sets the NDR database
        structures on a LDB DN

        This routine is important because if the last record on the DN
        is removed, this routine will put a tombstone in the record.
        '''
        return dsdb_dns.replace_by_dn(self, dn, new_records, tombstone)

    def garbage_collect_tombstones(self, dn, current_time,
                                   tombstone_lifetime=None):





	/* modify the record */
	werr = dns_common_replace(state->samdb, rec, dn,
				  needs_add, tombstoned,
				  state->soa_serial,
				  recs, num_recs);
	b9_reset_session_info(state);


	/* modify the record */
	werr = dns_common_replace(state->samdb, rec, dn,
				  false, /* needs_add */
				  false, /* tombstoned */
				  state->soa_serial,
				  recs, num_recs);
	b9_reset_session_info(state);


	/* modify the record */
	werr = dns_common_replace(state->samdb, tmp_ctx, dn,
				  false, /* needs_add */
				  false, /* tombstoned */
				  state->soa_serial,
				  recs, num_recs);
	b9_reset_session_info(state);

(-)a/source4/dns_server/dns_server.h (+1 lines)

Lines 97-102 WERROR dns_replace_records(struct dns_server *dns,	Link Here

			   TALLOC_CTX *mem_ctx,

			   TALLOC_CTX *mem_ctx,

			   struct ldb_dn *dn,

			   struct ldb_dn *dn,

			   bool needs_add,

			   bool needs_add,

100

			   bool tombstoned,

100

			   struct dnsp_DnssrvRpcRecord *records,

101

			   struct dnsp_DnssrvRpcRecord *records,

101

			   uint16_t rec_count);

102

			   uint16_t rec_count);

102

WERROR dns_name2dn(struct dns_server *dns,

103

WERROR dns_name2dn(struct dns_server *dns,




			rcount += 1;

			werror = dns_replace_records(dns, mem_ctx, dn,
						     needs_add, tombstoned,
						     recs, rcount);
			W_ERROR_NOT_OK_RETURN(werror);

			return WERR_OK;

			}

			werror = dns_replace_records(dns, mem_ctx, dn,
						     needs_add, tombstoned,
						     recs, rcount);
			W_ERROR_NOT_OK_RETURN(werror);

			return WERR_OK;

			recs[i] = recs[rcount];

			werror = dns_replace_records(dns, mem_ctx, dn,
						     needs_add, tombstoned,
						     recs, rcount);
			W_ERROR_NOT_OK_RETURN(werror);

			return WERR_OK;
		}

		werror = dns_replace_records(dns, mem_ctx, dn,
					     needs_add, tombstoned, recs,
					     rcount+1);
		W_ERROR_NOT_OK_RETURN(werror);

		return WERR_OK;

		}

		werror = dns_replace_records(dns, mem_ctx, dn,
					     needs_add, tombstoned, recs,
					     rcount);
		W_ERROR_NOT_OK_RETURN(werror);

		return WERR_OK;

		}

		werror = dns_replace_records(dns, mem_ctx, dn,
					     needs_add, tombstoned, recs,
					     rcount);
		W_ERROR_NOT_OK_RETURN(werror);
	}





			   TALLOC_CTX *mem_ctx,
			   struct ldb_dn *dn,
			   bool needs_add,
			   bool tombstoned,
			   struct dnsp_DnssrvRpcRecord *records,
			   uint16_t rec_count)
{
	/* TODO: Autogenerate this somehow */
	uint32_t dwSerial = 110;
	return dns_common_replace(dns->samdb, mem_ctx, dn,
				  needs_add, tombstoned, dwSerial, records,
				  rec_count);
}

bool dns_authoritative_for_zone(struct dns_server *dns,




			  TALLOC_CTX *mem_ctx,
			  struct ldb_dn *dn,
			  bool needs_add,
			  bool tombstoned,
			  uint32_t serial,
			  struct dnsp_DnssrvRpcRecord *records,
			  uint16_t rec_count)

	int ret;
	WERROR werr;
	struct ldb_message *msg = NULL;
	bool tombstoned_marker = false;
	bool become_tombstoned = false;

	msg = ldb_msg_new(mem_ctx);


		if (records[i].wType == DNS_TYPE_TOMBSTONE) {
			if (records[i].data.timestamp != 0) {
				tombstoned_marker = true;
			}
			continue;
		}

		enum ndr_err_code ndr_err;
		struct timeval tv;

		if (tombstoned && tombstoned_marker) {
			/*
			 * This is already a tombstoned object.
			 * Just leave it instead of updating the time stamp.

		become_tombstoned = true;
	}

	if (tombstoned || tombstoned_marker || become_tombstoned) {
		ret = ldb_msg_add_empty(msg, "dNSTombstoned",
					LDB_FLAG_MOD_REPLACE, NULL);
		if (ret != LDB_SUCCESS) {

(-)a/source4/dns_server/dnsserver_common.h (+1 lines)

Lines 53-58 WERROR dns_common_replace(struct ldb_context *samdb,	Link Here

			  TALLOC_CTX *mem_ctx,

			  TALLOC_CTX *mem_ctx,

			  struct ldb_dn *dn,

			  struct ldb_dn *dn,

			  bool needs_add,

			  bool needs_add,

			  bool tombstoned,

			  uint32_t serial,

			  uint32_t serial,

			  struct dnsp_DnssrvRpcRecord *records,

			  struct dnsp_DnssrvRpcRecord *records,

			  uint16_t rec_count);

			  uint16_t rec_count);




	struct ldb_dn *dn;
	struct dnsp_DnssrvRpcRecord *records;
	uint16_t num_records;
	bool tombstone = false;

	/*
	 * TODO: This is a shocking abuse, but matches what the

	 */
	static const int serial = 110;

	if (!PyArg_ParseTuple(args, "OsO|b", &py_ldb, &dns_name,
			      &py_dns_records, &tombstone)) {
		return NULL;
	}
	PyErr_LDB_OR_RAISE(py_ldb, samdb);

				  frame,
				  dn,
				  false, /* Not adding a record */
				  tombstone,
				  serial,
				  records,
				  num_records);

	struct ldb_dn *dn;
	struct dnsp_DnssrvRpcRecord *records;
	uint16_t num_records;
	bool tombstone = false;

	/*
	 * TODO: This is a shocking abuse, but matches what the

	 */
	static const int serial = 110;

	if (!PyArg_ParseTuple(args, "OOO|b", &py_ldb, &py_dn, &py_dns_records,
			      &tombstone)) {
		return NULL;
	}
	PyErr_LDB_OR_RAISE(py_ldb, samdb);

				  frame,
				  dn,
				  false, /* Not adding a record */
				  tombstone,
				  serial,
				  records,
				  num_records);
- 
--
source4/dns_server/dlz_bind9.c  | 2 +-
source4/dns_server/dns_update.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

(-)a/source4/dns_server/dlz_bind9.c (-1 / +1 lines)

Lines 1593-1599 _PUBLIC_ isc_result_t dlz_addrdataset(const char name, const char rdatastr, vo	Link Here

1593

		return ISC_R_FAILURE;

1593

		return ISC_R_FAILURE;

1594

1595

1596

	if (tombstoned) {

1596

	if (tombstoned && num_recs > 0 && recs[num_recs - 1].wType == DNS_TYPE_TOMBSTONE) {

1597

/*

1597

/*

1598

		 * we need to keep the existing tombstone record

1598

		 * we need to keep the existing tombstone record

1599

		 * and ignore it

1599

		 * and ignore it

(-)a/source4/dns_server/dns_update.c (-3 / +1 lines)

Lines 419-425 static WERROR handle_one_update(struct dns_server *dns,	Link Here

419

420

	W_ERROR_NOT_OK_RETURN(werror);

420

	W_ERROR_NOT_OK_RETURN(werror);

421

422

	if (tombstoned) {

422

	if (tombstoned && rcount > 0 && recs[rcount - 1].wType == DNS_TYPE_TOMBSTONE) {

423

/*

423

/*

424

		 * we need to keep the existing tombstone record

424

		 * we need to keep the existing tombstone record

425

		 * and ignore it

425

		 * and ignore it

426

427

--

428

python/samba/tests/dcerpc/dnsserver.py | 2 +-

426

python/samba/tests/dcerpc/dnsserver.py | 2 +-

429

1 file changed, 1 insertion(+), 1 deletion(-)

427

1 file changed, 1 insertion(+), 1 deletion(-)

(-)a/python/samba/tests/dcerpc/dnsserver.py (-2 / +1 lines)

Lines 192-198 class DnsserverTests(RpcInterfaceTestCase):	Link Here

192

193

        dn, record = self.get_record_from_db(self.custom_zone, "testrecord")

193

        dn, record = self.get_record_from_db(self.custom_zone, "testrecord")

194

        record.wType = dnsp.DNS_TYPE_TOMBSTONE

194

        record.wType = dnsp.DNS_TYPE_TOMBSTONE

195

        res = self.samdb.dns_replace_by_dn(dn, [record])

195

        res = self.samdb.dns_replace_by_dn(dn, [record], True)

196

        if res is not None:

196

        if res is not None:

197

            self.fail("Unable to update dns record to be tombstoned.")

197

            self.fail("Unable to update dns record to be tombstoned.")

198

199

Return to bug 41190