diff options
Diffstat (limited to 'dns/dualserver')
-rw-r--r-- | dns/dualserver/Makefile | 5 | ||||
-rw-r--r-- | dns/dualserver/files/extra-patch-dualserver.cpp | 59 | ||||
-rw-r--r-- | dns/dualserver/files/extra-patch-dualserver.h | 11 |
3 files changed, 0 insertions, 75 deletions
diff --git a/dns/dualserver/Makefile b/dns/dualserver/Makefile index f34b8333cd9..1096ed751e8 100644 --- a/dns/dualserver/Makefile +++ b/dns/dualserver/Makefile @@ -20,11 +20,6 @@ PLIST_FILES= sbin/dualserver etc/dualserver.conf.sample .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dualserver.h \ - ${FILESDIR}/extra-patch-dualserver.cpp -.endif - pre-patch: ${REINPLACE_CMD} 's|/etc/dualserver.ini|${PREFIX}/etc/dualserver.conf|' ${WRKSRC}/dualserver.cpp ${REINPLACE_CMD} 's|/etc/dualserver.state|/var/run/dualserver.state|' ${WRKSRC}/dualserver.cpp diff --git a/dns/dualserver/files/extra-patch-dualserver.cpp b/dns/dualserver/files/extra-patch-dualserver.cpp deleted file mode 100644 index dff2330641e..00000000000 --- a/dns/dualserver/files/extra-patch-dualserver.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- dualserver.cpp.orig Mon Jun 5 16:08:44 2006 -+++ dualserver.cpp Mon Jun 5 16:09:14 2006 -@@ -501,15 +501,15 @@ - if (!req->rtype) - { - req->dnsp.header.ancount = 0; -- req->dnsp.header.rcode = 3; -- req->dnsp.header.ra = 0; -+ req->dnsp.header.flags.rcode = 3; -+ req->dnsp.header.flags.ra = 0; - } - - req->dnsp.header.nscount = 0; - req->dnsp.header.adcount = 0; -- req->dnsp.header.qr = 1; -- req->dnsp.header.aa = 1; -- -+ req->dnsp.header.flags.qr = 1; -+ req->dnsp.header.flags.aa = 1; -+ - char *raw = req->dnsp.data; - - for (int i = 1; i <= ntohs(req->dnsp.header.qdcount); i++) -@@ -701,7 +701,7 @@ - time_t currentTime = time(NULL); - req->lease = cfig->lease; - -- if (ntohs(req->dnsp.header.qdcount) == 1 && ntohs(req->dnsp.header.opcode) == 0) -+ if (ntohs(req->dnsp.header.qdcount) == 1 && ntohs(req->dnsp.header.flags.opcode) == 0) - { - char *raw = req->dnsp.data; - raw += fQu(req->query, &req->dnsp, raw); -@@ -721,7 +721,7 @@ - { - if (!checkLocal(req, cfig)) - { -- if (!req->dnsp.header.rd) -+ if (!req->dnsp.header.flags.rd) - return genMess(req, cfig); - else - return 0; -@@ -1127,7 +1127,7 @@ - if (!found) - req->bytes = 0; - -- req->dnsp.header.aa = 0; -+ req->dnsp.header.flags.aa = 0; - return req->bytes; - } - -@@ -2216,7 +2216,7 @@ - - mess.header.xid = 6; - mess.header.qdcount = htons(1); -- mess.header.rd = 1; -+ mess.header.flags.rd = 1; - char *raw = mess.data; - raw += pQu(raw, "1.0.0.127.in-addr.arpa"); - raw += pShort(raw, DNS_TYPE_PTR); diff --git a/dns/dualserver/files/extra-patch-dualserver.h b/dns/dualserver/files/extra-patch-dualserver.h deleted file mode 100644 index f1d0cf494f9..00000000000 --- a/dns/dualserver/files/extra-patch-dualserver.h +++ /dev/null @@ -1,11 +0,0 @@ ---- dualserver.h.orig Sun Apr 30 11:33:14 2006 -+++ dualserver.h Sun Apr 30 11:33:37 2006 -@@ -98,7 +98,7 @@ - BYTE rcode: 4; - BYTE z: 3; - BYTE ra: 1; -- }; -+ } flags; - }; - union { - WORD zcount; |