Commit Diff
Diff:
2540a41a6896fa11814b9b6fcbf2d4e4c4cc8d11
4d8ed7e7a1f47791f872719b4cd10cb2033d8b75
Commit:
4d8ed7e7a1f47791f872719b4cd10cb2033d8b75
Tree:
77c4725ec487fcaddca915cc05ceb1af678fafc7
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Sat Apr 12 19:38:52 2014 UTC
Message:
* we don't have parse.c anymore, replace it with a yacc file (parse.y) * also update examples to version 6
blob - d0cb7a09ea17251c8b86325fa26355285612fcab
blob + 1633b7c4292fc1fefc84c93873fe2a83673ac7be
--- Makefile.freebsd7
+++ Makefile.freebsd7
@@ -1,6 +1,6 @@
PROG=wildcarddnsd
-SRCS=main.c parse.c reply.c additional.c region.c wildcard.c recurse.c res_random.c bsd-arc4random.c log.c axfr.c
+SRCS=main.c parse.y reply.c additional.c region.c wildcard.c recurse.c res_random.c bsd-arc4random.c log.c axfr.c
CFLAGS= -Wall -g -I/usr/local/include/db48/
LDFLAGS= -Wall -g -L/usr/local/lib/db48/
blob - 3b364152081a0f632e8096db9196443178cdd462
blob + e8c474b4823a31c1de81ce8c9a4b1df14baaad57
--- Makefile.freebsd8
+++ Makefile.freebsd8
@@ -1,6 +1,6 @@
PROG=wildcarddnsd
-SRCS=main.c parse.c reply.c additional.c region.c wildcard.c recurse.c res_random.c log.c axfr.c
+SRCS=main.c parse.y reply.c additional.c region.c wildcard.c recurse.c res_random.c log.c axfr.c
CFLAGS= -Wall -g -I/usr/local/include/db48/
LDFLAGS= -Wall -g -L/usr/local/lib/db48/
blob - a6b3f88a4c55c1c5e045eecc29dc59788662ff9e
blob + 7d7db6e18bbe05df62865878621a755659445953
--- Makefile.linux
+++ Makefile.linux
@@ -2,10 +2,12 @@ CC=gcc
#CFLAGS=-DDEBUG
CFLAGS=
LDADD= -ldb -lssl
+YACC=bison
build:
+ $(YACC) $(CFLAGS) -y -d parse.y
$(CC) $(CFLAGS) -c additional.c
$(CC) $(CFLAGS) -c main.c
$(CC) $(CFLAGS) -c parse.c
blob - 012c8509198de3fd1a8f6c474c55e888439c7240
blob + 242ae4c9d55787c68819744a24705e4aff4e6d53
--- Makefile.macosx
+++ Makefile.macosx
@@ -2,8 +2,10 @@ PROG=wildcarddnsd
CC=gcc
CFLAGS=-I/opt/local/include/db48 -L/opt/local/lib/db48 -D__APPLE_USE_RFC_3542=1
LDADD=-ldb -lssl -lcrypto -DDEFAULT_PRIVILEGE="nobody"
+YACC=yacc
build:
+ $(YACC) $(CFLAGS) -d parse.y
$(CC) $(CFLAGS) -c additional.c
$(CC) $(CFLAGS) -c main.c
$(CC) $(CFLAGS) -c parse.c
blob - 52b1f9b768e2faaa5c3081ad38d425e37fc4d294
blob + 19ac45818b08d37bfcf017563ae7643fcb7d96a3
--- Makefile.netbsd
+++ Makefile.netbsd
@@ -1,6 +1,6 @@
PROG=wildcarddnsd
-SRCS=main.c parse.c reply.c additional.c region.c wildcard.c recurse.c res_random.c bsd-arc4random.c log.c axfr.c
+SRCS=main.c parse.y reply.c additional.c region.c wildcard.c recurse.c res_random.c bsd-arc4random.c log.c axfr.c
CFLAGS= -Wall -g -I/usr/pkg/include/db46/
LDFLAGS= -Wall -g -L/usr/pkg/lib -R/usr/pkg/lib
blob - ac063f1911402effabab59bf15d24196ba56a177
blob + 0fffe1cf10f04ef76326010436bd09a6886c3bd6
--- Makefile.openbsd
+++ Makefile.openbsd
@@ -1,6 +1,6 @@
PROG=wildcarddnsd
-SRCS=main.c parse.c reply.c additional.c region.c wildcard.c recurse.c res_random.c log.c axfr.c
+SRCS=main.c parse.y reply.c additional.c region.c wildcard.c recurse.c res_random.c log.c axfr.c
#CFLAGS= -DDEBUG -g -Wall
CFLAGS= -Wall -g -I/usr/local/include/db4
blob - e6b0afbfd919d1bb7a53ec4621327565c468f9ad
blob + 4e05f31d6fff8bf76687348129062a4c349f23e4
--- example1.conf
+++ example1.conf
@@ -4,7 +4,7 @@
#
#
-version "5";
+version "6";
; WARNING - the way wildcarddnsd originally implemented wildcarding is
; wrong and can cause damage on the Internet (DoS), it can
@@ -76,7 +76,7 @@ zone "default" {
*,ns,3600,ns.neptune.local.
;
; TXT RR's have this format
- *,txt,3600,this is a text
+ *,txt,3600,"this is a text"
; close zone
}
blob - afe64a7ddbcddd45b34cc5da29d26bad632310d8
blob + 24407f9191d54aeb323219844ecf64776f78741d
--- example11.conf
+++ example11.conf
@@ -1,6 +1,6 @@
; sample config file that is in production.
;
-version "5";
+version "6";
; WARNING - the way wildcarddnsd originally implemented wildcarding is
; wrong and can cause damage on the Internet (DoS), it can
blob - 2cd1f81264158d065cb6b783dfbfe2cec4cc7a62
blob + a4476a364230acbc2c25daef97b07f54d46c1995
--- example2.conf
+++ example2.conf
@@ -4,7 +4,7 @@
#
#
-version "5";
+version "6";
; WARNING - the way wildcarddnsd originally implemented wildcarding is
; wrong and can cause damage on the Internet (DoS), it can
@@ -83,7 +83,7 @@ zone "default" {
area5.solarscale.de,a,3600,192.168.0.11
11.0.168.192.in-addr.arpa.,ptr,3600,area5.solarscale.de.
perdita.solarscale.de,a,3600,192.168.0.23
- perdita.solarscale.de,txt,3600,also does IPv6
+ perdita.solarscale.de,txt,3600,"also does IPv6"
23.0.168.192.in-addr.arpa,ptr,3600,perdita.solarscale.de.
itojun.solarscale.de,cname,3600,perdita.solarscale.de.
desdemona.solarscale.de,a,3600,192.168.0.15
blob - 17a1656fbb9749c09341e51824c46759d8032e30
blob + b9ea0396853bd925dcdf5ff418fb74982a1bd808
--- example3.conf
+++ example3.conf
@@ -1,5 +1,5 @@
# wildcarddns - RR configuration file
-version "5";
+version "6";
zone "centroid.eu" {
# serial, refresh, retry, expire, zone time to live (no spaces)
blob - 3974f62258b44abb8ed5f7ea710a42dcf2e3a4fd
blob + a040c1c9db7bef8dbc7e00e7653fd1cf6612e59d
--- example4.conf
+++ example4.conf
@@ -1,6 +1,6 @@
; sample config file that is in production.
;
-version "5";
+version "6";
; WARNING - the way wildcarddnsd originally implemented wildcarding is
; wrong and can cause damage on the Internet (DoS), it can
@@ -82,8 +82,8 @@ zone "centroid.eu" {
; balance these two
centroid.eu,balance,3600,62.75.160.180
centroid.eu,balance,3600,192.168.0.24
- centroid.eu,txt,3600,1234
- text.centroid.eu,txt,3600,,,,this is valid,,,too,,,
+ centroid.eu,txt,3600,"1234"
+ text.centroid.eu,txt,3600",,,,this is valid,,,too,,,"
}
zone "root hints" {
blob - 44307add3a51d562171f84817e303c9c2e11e830
blob + 7f44fbbe5a96e6a84f475c73a0d3fd79807e59d2
--- example6.conf
+++ example6.conf
@@ -1,6 +1,6 @@
; sample config file that is in production.
;
-version "5";
+version "6";
recurse-for "these hosts" {
127.0.0.1/32;
blob - 212a92bf99e874a2c11bd7d881be2414630769ce
blob + 98f3d0ec7c1b7e1fefbe2db3b8db6f7763e0b5d0
--- example7.conf
+++ example7.conf
@@ -1,6 +1,6 @@
; sample config file that is in production.
;
-version "5";
+version "6";
; WARNING - the way wildcarddnsd originally implemented wildcarding is
; wrong and can cause damage on the Internet (DoS), it can
repomaster@centroid.eu