Commit Diff
Diff:
750bd58499bd2fbdc7e6f9f486c3925e486e00b4
4d7c9557e0a51d64af30a01007c4d6867abbb2f1
Commit:
4d7c9557e0a51d64af30a01007c4d6867abbb2f1
Tree:
8b4669ed8151611991afafa4364415e8b63f9343
Author:
pbug <pbug@delphinusdns.org>
Committer:
pbug <pbug@delphinusdns.org>
Date:
Tue Nov 9 09:42:57 2010 UTC
Message:
* forgot a "break" in a switch, for some reason it worked on OpenBSD 4.7 and not on OpenBSD 4.8, coulda been the difference in compiler although the logic of this fix is right. * added example6.conf for recursive testing tested on OpenBSD 4.8
blob - /dev/null
blob + 206b1a9c84f79104e3340e6101ca1bf5fd6d6381 (mode 644)
--- /dev/null
+++ example6.conf
@@ -0,0 +1,44 @@
+; sample config file that is in production.
+;
+version "4";
+
+recurse-for "these hosts" {
+ 127.0.0.1/32;
+ ::1/128;
+}
+
+zone "root hints" {
+ .,hint,3600000,A.ROOT-SERVERS.NET.
+ A.ROOT-SERVERS.NET.,a,3600000,198.41.0.4
+ A.ROOT-SERVERS.NET.,aaaa,3600000,2001:503:BA3E::2:30
+ .,hint,3600000,B.ROOT-SERVERS.NET.
+ B.ROOT-SERVERS.NET.,a,3600000,192.228.79.201
+ .,hint,3600000,C.ROOT-SERVERS.NET.
+ C.ROOT-SERVERS.NET.,a,3600000,192.33.4.12
+ .,hint,3600000,D.ROOT-SERVERS.NET.
+ D.ROOT-SERVERS.NET.,a,3600000,128.8.10.90
+ .,hint,3600000,E.ROOT-SERVERS.NET.
+ E.ROOT-SERVERS.NET.,a,3600000,192.203.230.10
+ .,hint,3600000,F.ROOT-SERVERS.NET.
+ F.ROOT-SERVERS.NET.,a,3600000,192.5.5.241
+ F.ROOT-SERVERS.NET.,aaaa,3600000,2001:500:2f::f
+ .,hint,3600000,G.ROOT-SERVERS.NET.
+ G.ROOT-SERVERS.NET.,a,3600000,192.112.36.4
+ .,hint,3600000,H.ROOT-SERVERS.NET.
+ H.ROOT-SERVERS.NET.,a,3600000,128.63.2.53
+ H.ROOT-SERVERS.NET.,aaaa,3600000,2001:500:1::803f:235
+ .,hint,3600000,I.ROOT-SERVERS.NET.
+ I.ROOT-SERVERS.NET.,a,3600000,192.36.148.17
+ .,hint,3600000,J.ROOT-SERVERS.NET.
+ J.ROOT-SERVERS.NET.,a,3600000,192.58.128.30
+ J.ROOT-SERVERS.NET.,aaaa,3600000,2001:503:C27::2:30
+ .,hint,3600000,K.ROOT-SERVERS.NET.
+ K.ROOT-SERVERS.NET.,a,3600000,193.0.14.129
+ K.ROOT-SERVERS.NET.,aaaa,3600000,2001:7fd::1
+ .,hint,3600000,L.ROOT-SERVERS.NET.
+ L.ROOT-SERVERS.NET.,a,3600000,199.7.83.42
+ L.ROOT-SERVERS.NET.,aaaa,3600000,2001:500:3::42
+ .,hint,3600000,M.ROOT-SERVERS.NET.
+ M.ROOT-SERVERS.NET.,a,3600000,202.12.27.33
+ M.ROOT-SERVERS.NET.,aaaa,3600000,2001:dc3::35
+}
blob - 89220a154fd14f54ad667edb689edb5b98ff9cc2
blob + 322dcfbdb9257f868e03c69c9fe2e625455cccb8
--- recurse.c
+++ recurse.c
@@ -87,7 +87,7 @@ struct recurseentry {
} *rn1, *rn2, *rnp;
-static const char rcsid[] = "$Id: recurse.c,v 1.31 2010/11/06 17:29:38 pbug Exp $";
+static const char rcsid[] = "$Id: recurse.c,v 1.32 2010/11/09 09:42:57 pbug Exp $";
/*
* INIT_RECURSE - initialize the recurse singly linked list
@@ -241,6 +241,7 @@ recurseloop(int sp, int *raw, DB *db)
char fakereplystring[DNS_MAXNAME + 1];
char buf[2048];
+ char address[INET6_ADDRSTRLEN];
SLIST_INIT(&recurseshead);
@@ -420,13 +421,16 @@ recurseloop(int sp, int *raw, DB *db)
syslog(LOG_ERR, "return address is not from right nameserver");
continue;
}
+ break;
case AF_INET6:
sin6 = (struct sockaddr_in6*)&ssin;
if (memcmp((char *)&sin6->sin6_addr, (char *)&sr1->aaaa[0], sizeof(struct in6_addr)) != 0) {
+ inet_ntop(AF_INET6, &sin6->sin6_addr, address, sizeof(address));
- syslog(LOG_ERR, "return IPv6 address is not from right nameserver");
+ syslog(LOG_ERR, "return IPv6 address (%s) is not from right nameserver", address);
continue;
}
+ break;
}
#endif
repomaster@centroid.eu