"policy: move knot_is_nsec3_enabled into update_policy_from_zone"

src/knot/dnssec/policy.c

-/*  Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 #include <assert.h>
 
 #include "knot/dnssec/context.h"
+#include "knot/dnssec/zone-nsec.h"
 #include "knot/zone/contents.h"
 #include "libknot/rrtype/soa.h"
 
@@ -41,4 +42,5 @@ void update_policy_from_zone(dnssec_kasp_policy_t *policy,
 	policy->soa_minimal_ttl = zone_soa_min_ttl(zone);
 	policy->dnskey_ttl = zone_soa_ttl(zone);
 	policy->zone_maximal_ttl = 0; // TODO
+	policy->nsec3_enabled = knot_is_nsec3_enabled(zone); // TODO: temporary
 }

src/knot/dnssec/policy.h

-/*  Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "knot/conf/conf.h"
 #include "knot/dnssec/context.h"
 #include "knot/zone/contents.h"
 
@@ -25,9 +24,3 @@
  */
 void update_policy_from_zone(dnssec_kasp_policy_t *policy,
                              const zone_contents_t *zone);
-
-/*!
- * \brief Set default DNSSEC policy for zone without assigned policy.
- */
-void set_default_policy(dnssec_kasp_policy_t *policy,
-                        const zone_contents_t *zone);

src/knot/dnssec/zone-events.c

-/*  Copyright (C) 2013 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,12 +15,10 @@
  */
 
 #include <assert.h>
-#include <time.h>
 
 #include "dnssec/error.h"
 #include "dnssec/event.h"
 #include "contrib/macros.h"
-#include "contrib/string.h"
 #include "libknot/libknot.h"
 #include "knot/conf/conf.h"
 #include "knot/common/log.h"
@@ -31,7 +29,6 @@
 #include "knot/dnssec/zone-nsec.h"
 #include "knot/dnssec/zone-sign.h"
 #include "knot/zone/serial.h"
-#include "knot/zone/zone.h"
 
 static int sign_init(const zone_contents_t *zone, int flags, kdnssec_ctx_t *ctx)
 {
@@ -62,7 +59,6 @@ static int sign_init(const zone_contents_t *zone, int flags, kdnssec_ctx_t *ctx)
 	// update policy based on the zone content
 
 	update_policy_from_zone(ctx->policy, zone);
-	ctx->policy->nsec3_enabled = knot_is_nsec3_enabled(zone); // TODO: temporary
 
 	// RRSIG handling