query_getzonedb can returns DNS_R_EXPIRED

If `query_getzonedb()` finds a zone but the zone is expired it
immediately returns `DNS_R_EXPIRED` and doesn't attempt to get the zone
DB (which would be NULL in this case).

This enable caller to have a more precise reason of why getting the DB
has failed.

diff --git a/lib/ns/query.c b/lib/ns/query.c
index 9f59e9a577f8f608649f80b533ad002341bccdfe..b9bd2b892a69e13e6b024a104de6f9a5565f1b27 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -1250,6 +1250,11 @@ query_getzonedb(ns_client_t *client, const dns_name_t *name,
                partial = true;
        }
        if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
+               if (dns_zone_isexpired(zone)) {
+                       result = DNS_R_EXPIRED;
+                       goto fail;
+               }
+
                result = dns_zone_getdb(zone, &db);
        }