diff options
Diffstat (limited to 'lib/dns/private.c')
| -rw-r--r-- | lib/dns/private.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/dns/private.c b/lib/dns/private.c index c29522c52990..76a26e827728 100644 --- a/lib/dns/private.c +++ b/lib/dns/private.c @@ -18,10 +18,11 @@ #include "config.h" +#include <isc/base64.h> +#include <isc/print.h> #include <isc/result.h> #include <isc/string.h> #include <isc/types.h> -#include <isc/base64.h> #include <dns/nsec3.h> #include <dns/private.h> @@ -306,7 +307,7 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { unsigned char newbuf[DNS_NSEC3PARAM_BUFFERSIZE]; dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_nsec3param_t nsec3param; - isc_boolean_t remove, init, nonsec; + isc_boolean_t delete, init, nonsec; isc_buffer_t b; if (!dns_nsec3param_fromprivate(private, &rdata, nsec3buf, @@ -315,7 +316,7 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { CHECK(dns_rdata_tostruct(&rdata, &nsec3param, NULL)); - remove = ISC_TF((nsec3param.flags & DNS_NSEC3FLAG_REMOVE) != 0); + delete = ISC_TF((nsec3param.flags & DNS_NSEC3FLAG_REMOVE) != 0); init = ISC_TF((nsec3param.flags & DNS_NSEC3FLAG_INITIAL) != 0); nonsec = ISC_TF((nsec3param.flags & DNS_NSEC3FLAG_NONSEC) != 0); @@ -326,7 +327,7 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { if (init) isc_buffer_putstr(buf, "Pending NSEC3 chain "); - else if (remove) + else if (delete) isc_buffer_putstr(buf, "Removing NSEC3 chain "); else isc_buffer_putstr(buf, "Creating NSEC3 chain "); @@ -339,18 +340,18 @@ dns_private_totext(dns_rdata_t *private, isc_buffer_t *buf) { CHECK(dns_rdata_totext(&rdata, NULL, buf)); - if (remove && !nonsec) + if (delete && !nonsec) isc_buffer_putstr(buf, " / creating NSEC chain"); } else if (private->length == 5) { unsigned char alg = private->data[0]; dns_keytag_t keyid = (private->data[2] | private->data[1] << 8); char keybuf[BUFSIZ], algbuf[DNS_SECALG_FORMATSIZE]; - isc_boolean_t remove = ISC_TF(private->data[3] != 0); + isc_boolean_t delete = ISC_TF(private->data[3] != 0); isc_boolean_t complete = ISC_TF(private->data[4] != 0); - if (remove && complete) + if (delete && complete) isc_buffer_putstr(buf, "Done removing signatures for "); - else if (remove) + else if (delete) isc_buffer_putstr(buf, "Removing signatures for "); else if (complete) isc_buffer_putstr(buf, "Done signing with "); |