s4-dns: return the correct TTL
authorAndrew Tridgell <tridge@samba.org>
Mon, 6 Dec 2010 06:18:30 +0000 (17:18 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 6 Dec 2010 07:12:11 +0000 (08:12 +0100)
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

source4/dns_server/dlz_bind9.c

index 5249ca3d7c02d8b635b3dfee045e054640ea6c6a..2631272e0d8487b85593bbe0336a3a1b67522e0e 100644 (file)
@@ -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);
        }