Commit Diff
Diff:
2dac465101cf1f19221cbb583a08dbab08a01f28
a5b402209709c625ac738d9ab35684e430131f91
Commit:
a5b402209709c625ac738d9ab35684e430131f91
Tree:
5d95107962bb38bf33f9d3e8ac2cb2366f0a5fcc
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Sat May 12 05:59:40 2018 UTC
Message:
during regression testing, it was noticed that the NAPTR bindfile output is erroneous
blob - e8a7ca63cc2b769569780b4835da86b73a4b93e6
blob + eba1accca2c8bff6057b4dcdae170d79b8788c22
--- dddctl.c
+++ dddctl.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: dddctl.c,v 1.12 2018/05/11 23:21:20 pjp Exp $
+ * $Id: dddctl.c,v 1.13 2018/05/12 05:59:40 pjp Exp $
*/
#include "ddd-include.h"
@@ -7458,7 +7458,7 @@ print_sd_bind(FILE *of, struct domain *sdomain)
return -1;
}
for (i = 0; i < sdnaptr->naptr_count; i++) {
- fprintf(of, "%s %d IN NAPTR (\t\t%d\t; order\n\t\t%d\t; preference\n\t\t\"",
+ fprintf(of, "%s %d IN NAPTR %d\t%d\t\"",
convert_name(sdomain->zone, sdomain->zonelen),
sdomain->ttl[INTERNAL_TYPE_NAPTR],
sdnaptr->naptr[i].order,
@@ -7467,15 +7467,15 @@ print_sd_bind(FILE *of, struct domain *sdomain)
for (x = 0; x < sdnaptr->naptr[i].flagslen; x++) {
fprintf(of, "%c", sdnaptr->naptr[i].flags[x]);
}
- fprintf(of, "\"\t; flag\n\t\t\"");
+ fprintf(of, "\"\t\"");
for (x = 0; x < sdnaptr->naptr[i].serviceslen; x++) {
fprintf(of, "%c", sdnaptr->naptr[i].services[x]);
}
- fprintf(of, "\"\t; service\n\t\t\"");
+ fprintf(of, "\"\t\"");
for (x = 0; x < sdnaptr->naptr[i].regexplen; x++) {
fprintf(of, "%c", sdnaptr->naptr[i].regexp[x]);
}
- fprintf(of, "\"\t; regexp\n\t\t%s ) ; replacement\n", (sdnaptr->naptr[i].replacement[0] == '\0') ? "." : convert_name(sdnaptr->naptr[i].replacement, sdnaptr->naptr[i].replacementlen));
+ fprintf(of, "\"\t%s\n", (sdnaptr->naptr[i].replacement[0] == '\0') ? "." : convert_name(sdnaptr->naptr[i].replacement, sdnaptr->naptr[i].replacementlen));
}
}
if (sdomain->flags & DOMAIN_HAVE_TXT) {
repomaster@centroid.eu