From 5845cc94a99bcb2115c6edbd1711444e640c40d4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 6 Dec 2010 17:18:30 +1100 Subject: s4-dns: return the correct TTL I've now patched the bind9 sdlz layer to cope with multiple TTLS on a name/type pair Autobuild-User: Andrew Tridgell Autobuild-Date: Mon Dec 6 08:12:11 CET 2010 on sn-devel-104 --- source4/dns_server/dlz_bind9.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source4/dns_server') diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c index 5249ca3d7c..2631272e0d 100644 --- a/source4/dns_server/dlz_bind9.c +++ b/source4/dns_server/dlz_bind9.c @@ -180,9 +180,7 @@ static isc_result_t b9_putrr(struct dlz_bind9_data *state, } } - /* FIXME: why does dlz insist on all TTL values being the same - for the same name? */ - result = state->putrr(handle, type, /* rec->dwTtlSeconds */ 900, data); + result = state->putrr(handle, type, rec->dwTtlSeconds, data); if (result != ISC_R_SUCCESS) { state->log(ISC_LOG_ERROR, "Failed to put rr"); } @@ -211,9 +209,7 @@ static isc_result_t b9_putnamedrr(struct dlz_bind9_data *state, return ISC_R_NOMEMORY; } - /* FIXME: why does dlz insist on all TTL values being the same - for the same name? */ - result = state->putnamedrr(handle, name, type, /* rec->dwTtlSeconds */ 900, data); + result = state->putnamedrr(handle, name, type, rec->dwTtlSeconds, data); if (result != ISC_R_SUCCESS) { state->log(ISC_LOG_ERROR, "Failed to put named rr '%s'", name); } -- cgit