diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-12-06 17:18:30 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-12-06 08:12:11 +0100 |
| commit | 5845cc94a99bcb2115c6edbd1711444e640c40d4 (patch) | |
| tree | 30af1144bad80454f93d8901133a65851161f02f /source4/dns_server | |
| parent | 49e0aef3cb74b96ee710d5c705aa48512d81cddc (diff) | |
| download | samba-5845cc94a99bcb2115c6edbd1711444e640c40d4.tar.gz samba-5845cc94a99bcb2115c6edbd1711444e640c40d4.tar.bz2 samba-5845cc94a99bcb2115c6edbd1711444e640c40d4.zip | |
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 <tridge@samba.org>
Autobuild-Date: Mon Dec 6 08:12:11 CET 2010 on sn-devel-104
Diffstat (limited to 'source4/dns_server')
| -rw-r--r-- | source4/dns_server/dlz_bind9.c | 8 |
1 files changed, 2 insertions, 6 deletions
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); } |