Commit Diff
Diff:
542f8a152c8c8b09be0364b542f61dfe1da491ee
e5bd0d936a4aaef51ae994b59d1cd3bb7c135bb4
Commit:
e5bd0d936a4aaef51ae994b59d1cd3bb7c135bb4
Tree:
1c7d53894af587085e50830bc7a337f61e219b20
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Sat Nov 7 18:09:34 2015 UTC
Message:
* sort the nsec3 stuff at insertion, because dnssec-signzone doesn't guarantee a sorted nsec3 RR list * remove naptr from example8 (temporarily)
blob - b1997d876fa62d035170375ca985635cca8b5616
blob + 318bea250aea0b2549390ad631e4b34764a18c8e
--- README
+++ README
@@ -1,4 +1,4 @@
-$Id: README,v 1.3 2014/11/14 08:43:11 pjp Exp $
+$Id: README,v 1.4 2015/11/07 18:09:34 pjp Exp $
1. README
2. WHY DELPHINUSDNS?
@@ -113,7 +113,7 @@ in your /etc/rc.conf and reboot the jail.
## configure the platform
$ sh configure
## this will install the development programs you'll need (as root)
-$ pkg_add db-4.6.21p0v0
+$ pkg_add db-4.6.21p0v0 isc-bind
## add a privsep user (_ddd) with a chroot directory (as root)
$ vipw
## or
blob - ccf9a1b667276c4aa0ced073df499435e1227f82
blob + 1198972152850c72265c1420db6b9b900a1bba9b
--- dnssec.c
+++ dnssec.c
@@ -135,7 +135,30 @@ insert_nsec3(char *zonename, char *domainname, char *d
memcpy(n3->dname, dname, dnamelen);
n3->dnamelen = dnamelen;
- TAILQ_INSERT_TAIL(&dn->nsec3head, n3, nsec3_entries);
+
+ /*
+ * sort the tailq here
+ */
+
+ if (TAILQ_EMPTY(&dn->nsec3head)) {
+ TAILQ_INSERT_TAIL(&dn->nsec3head, n3, nsec3_entries);
+ } else {
+ ns3p = TAILQ_FIRST(&dn->nsec3head);
+ if (strcmp(n3->domainname, ns3p->domainname) < 0) {
+ TAILQ_INSERT_BEFORE(ns3p, n3, nsec3_entries);
+ } else {
+ while ((ns3p = TAILQ_NEXT(ns3p, nsec3_entries)) != NULL) {
+ if (strcmp(n3->domainname, ns3p->domainname) < 0) {
+ TAILQ_INSERT_BEFORE(ns3p, n3, nsec3_entries);
+ break;
+ }
+ }
+ }
+ if (ns3p == NULL) {
+ TAILQ_INSERT_TAIL(&dn->nsec3head, n3, nsec3_entries);
+ }
+ }
+
return (0);
}
blob - 311eb2a2dd31eff6e54e4ff49f72e92b37389101
blob + 95b3d5795b1af5a0f9afbab5f28677384017bbb8
--- examples/example8.conf
+++ examples/example8.conf
@@ -55,8 +55,8 @@ zone "centroid.eu" {
;
;
; NAPTR trial
- centroid.eu,naptr,3600,10,10,"u","E2U+sip","!^.*$!sip:1234@sip.example.com!",centroid.eu
- centroid.eu,naptr,3600,10,20,"u","E2U+sip","!^.*$!sip:1234@sip.example.com!",.
+ ;centroid.eu,naptr,3600,10,10,"u","E2U+sip","!^.*$!sip:1234@sip.example.com!",centroid.eu.
+ ;centroid.eu,naptr,3600,10,20,"u","E2U+sip","!^.*$!sip:1234@sip.example.com!",.
;
www.centroid.eu,a,3600,62.75.160.180
repomaster@centroid.eu