Adding upstream version 1:9.11.5.P4+dfsg.upstream/1%9.11.5.P4+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 1306 insertions, 0 deletions

diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
new file mode 100644
index 0000000..47a3a1a
--- /dev/null
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -0,0 +1,50 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# $Id: Makefile.in,v 1.22 2009/12/05 23:31:40 each Exp $
+
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+
+VERSION=@BIND9_VERSION@
+
+@BIND9_MAKE_INCLUDES@
+
+CINCLUDES =	${LWRES_INCLUDES} ${ISC_INCLUDES}
+
+CDEFINES =
+CWARNINGS =
+
+LWRESLIBS =	../../../../lib/lwres/liblwres.@A@
+ISCLIBS =	../../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+
+LWRESDEPLIBS =	../../../../lib/lwres/liblwres.@A@
+ISCDEPLIBS =	../../../../lib/isc/libisc.@A@
+
+DEPLIBS =	${LWRESDEPLIBS} ${ISCDEPLIBS}
+
+LIBS =		${LWRESLIBS} ${ISCLIBS} @LIBS@
+
+TARGETS =	lwtest@EXEEXT@
+
+OBJS =		lwtest.@O@
+
+SRCS =		lwtest.c
+
+@BIND9_MAKE_RULES@
+
+all: lwtest@EXEEXT@
+
+lwtest@EXEEXT@: ${OBJS} ${DEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+
+clean distclean::
+	rm -f ${TARGETS}
+
diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh
new file mode 100644
index 0000000..155c479
--- /dev/null
+++ b/bin/tests/system/lwresd/clean.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+#
+# Clean up after lwresd tests.
+#
+rm -f */named.memstats
+rm -f */named.run
+rm -f dig.out
+rm -f lwresd1/lwresd.run.resolv
+rm -f lwresd1/lwresd.run.lwresd
+rm -f ns*/named.lock
+rm -f lwresd*/lwresd.lock
+rm -f lwresd*/lwresd.run
diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf
new file mode 100644
index 0000000..5c30f88
--- /dev/null
+++ b/bin/tests/system/lwresd/lwresd1/lwresd.conf
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */
+
+controls { /* empty */ };
+
+options {
+	port 5300;
+	pid-file "lwresd.pid";
+	forwarders {10.53.0.1;};
+	forward only;
+};
+
+lwres {
+	listen-on {10.53.0.1 port 9210;};
+	view "_default";
+	search {example1.;};
+	ndots 1;
+};
diff --git a/bin/tests/system/lwresd/lwresd1/nosearch.conf b/bin/tests/system/lwresd/lwresd1/nosearch.conf
new file mode 100644
index 0000000..52c0b7d
--- /dev/null
+++ b/bin/tests/system/lwresd/lwresd1/nosearch.conf
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/* $Id: lwresd.conf,v 1.8 2007/06/19 23:47:04 tbox Exp $ */
+
+controls { /* empty */ };
+
+options {
+	port 5300;
+	pid-file "lwresd.pid";
+	forwarders {10.53.0.1;};
+	forward only;
+};
+
+lwres {
+	listen-on {10.53.0.1 port 9210;};
+	view "_default";
+	ndots 1;
+};
diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf
new file mode 100644
index 0000000..0d6f111
--- /dev/null
+++ b/bin/tests/system/lwresd/lwresd1/resolv.conf
@@ -0,0 +1,15 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# $Id: resolv.conf,v 1.11 2007/06/19 23:47:04 tbox Exp $
+
+nameserver 10.53.0.1
+lwserver 10.53.0.1
+search example1.
+ndots 1
diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c
new file mode 100644
index 0000000..b690c75
--- /dev/null
+++ b/bin/tests/system/lwresd/lwtest.c
@@ -0,0 +1,797 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/* $Id: lwtest.c,v 1.32 2008/04/02 02:37:42 marka Exp $ */
+
+#include <config.h>
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdlib.h>
+
+#include <isc/net.h>
+#include <isc/print.h>
+#include <isc/string.h>
+#include <isc/util.h>
+
+#include <lwres/lwres.h>
+#include <lwres/netdb.h>
+#include <lwres/net.h>
+
+/*
+ * XXX getnameinfo errors, which don't appear to be standard.
+ */
+#define ENI_NOSERVNAME  1
+#define ENI_NOHOSTNAME  2
+#define ENI_MEMORY      3
+#define ENI_SYSTEM      4
+#define ENI_FAMILY      5
+#define ENI_SALEN       6
+#define ENI_NOSOCKET    7
+
+static int fails = 0;
+
+static void
+CHECK(lwres_result_t val, const char *msg) {
+	if (val != 0) {
+		printf("I:%s returned %d\n", msg, val);
+		exit(1);
+	}
+}
+
+static unsigned char TESTSTRING[] =
+	"This is a test.  This is only a test.  !!!";
+
+static lwres_context_t *ctx;
+
+static void
+test_noop(void) {
+	lwres_result_t ret;
+	lwres_lwpacket_t pkt, pkt2;
+	lwres_nooprequest_t nooprequest, *nooprequest2;
+	lwres_noopresponse_t noopresponse, *noopresponse2;
+	lwres_buffer_t b;
+
+	pkt.pktflags = 0;
+	pkt.serial = 0x11223344;
+	pkt.recvlength = 0x55667788;
+	pkt.result = 0;
+
+	nooprequest.datalength = strlen((char *)TESTSTRING);
+	nooprequest.data = TESTSTRING;
+	ret = lwres_nooprequest_render(ctx, &nooprequest, &pkt, &b);
+	CHECK(ret, "lwres_nooprequest_render");
+
+	/*
+	 * Now, parse it into a new structure.
+	 */
+	lwres_buffer_first(&b);
+	ret = lwres_lwpacket_parseheader(&b, &pkt2);
+	CHECK(ret, "lwres_lwpacket_parseheader");
+
+	nooprequest2 = NULL;
+	ret = lwres_nooprequest_parse(ctx, &b, &pkt2, &nooprequest2);
+	CHECK(ret, "lwres_nooprequest_parse");
+
+	assert(nooprequest.datalength == nooprequest2->datalength);
+	assert(memcmp(nooprequest.data, nooprequest2->data,
+		       nooprequest.datalength) == 0);
+
+	lwres_nooprequest_free(ctx, &nooprequest2);
+
+	lwres_context_freemem(ctx, b.base, b.length);
+	b.base = NULL;
+	b.length = 0;
+
+	pkt.pktflags = 0;
+	pkt.serial = 0x11223344;
+	pkt.recvlength = 0x55667788;
+	pkt.result = 0xdeadbeef;
+
+	noopresponse.datalength = strlen((char *)TESTSTRING);
+	noopresponse.data = TESTSTRING;
+	ret = lwres_noopresponse_render(ctx, &noopresponse, &pkt, &b);
+	CHECK(ret, "lwres_noopresponse_render");
+
+	/*
+	 * Now, parse it into a new structure.
+	 */
+	lwres_buffer_first(&b);
+	ret = lwres_lwpacket_parseheader(&b, &pkt2);
+	CHECK(ret, "lwres_lwpacket_parseheader");
+
+	noopresponse2 = NULL;
+	ret = lwres_noopresponse_parse(ctx, &b, &pkt2, &noopresponse2);
+	CHECK(ret, "lwres_noopresponse_parse");
+
+	assert(noopresponse.datalength == noopresponse2->datalength);
+	assert(memcmp(noopresponse.data, noopresponse2->data,
+		       noopresponse.datalength) == 0);
+
+	lwres_noopresponse_free(ctx, &noopresponse2);
+
+	lwres_context_freemem(ctx, b.base, b.length);
+	b.base = NULL;
+	b.length = 0;
+}
+
+static void
+test_gabn(const char *target, lwres_result_t expected, const char *address,
+	  uint32_t af)
+{
+	lwres_gabnresponse_t *res;
+	unsigned char addrbuf[16];
+	lwres_addr_t *addr;
+	char outbuf[64];
+	unsigned int len;
+	lwres_result_t ret;
+
+	res = NULL;
+	ret = lwres_getaddrsbyname(ctx, target,
+				   LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6,
+				   &res);
+	if (ret != expected) {
+		printf("I:gabn(%s) failed: %d\n", target, ret);
+		if (res != NULL)
+			lwres_gabnresponse_free(ctx, &res);
+		fails++;
+		return;
+	}
+	if (ret == LWRES_R_SUCCESS) {
+		if (af == LWRES_ADDRTYPE_V4) {
+			len = 4;
+			ret = inet_pton(AF_INET, address, addrbuf);
+			assert(ret == 1);
+		} else {
+			len = 16;
+			ret = inet_pton(AF_INET6, address, addrbuf);
+			assert(ret == 1);
+		}
+		addr = LWRES_LIST_HEAD(res->addrs);
+		if (addr == NULL) {
+			printf("I:gabn(%s) returned empty list\n", target);
+			fails++;
+			return;
+		}
+		while (addr != NULL) {
+			if (addr->family != af || addr->length != len ||
+			    memcmp(addr->address, addrbuf, len) == 0)
+				break;
+			addr = LWRES_LIST_NEXT(addr, link);
+		}
+		if (addr == NULL) {
+			addr = LWRES_LIST_HEAD(res->addrs);
+			if (addr->family == LWRES_ADDRTYPE_V4)
+				(void)inet_ntop(AF_INET, addr->address,
+						outbuf, sizeof(outbuf));
+			else
+				(void)inet_ntop(AF_INET6, addr->address,
+						outbuf, sizeof(outbuf));
+			printf("I:gabn(%s) returned %s, expected %s\n",
+				target, outbuf, address);
+			fails++;
+			return;
+		}
+	}
+	if (res != NULL)
+		lwres_gabnresponse_free(ctx, &res);
+}
+
+static void
+test_gnba(const char *target, uint32_t af, lwres_result_t expected,
+	  const char *name)
+{
+	lwres_gnbaresponse_t *res;
+	lwres_result_t ret;
+	unsigned char addrbuf[16];
+	unsigned int len;
+
+	if (af == LWRES_ADDRTYPE_V4) {
+		len = 4;
+		ret = inet_pton(AF_INET, target, addrbuf);
+		assert(ret == 1);
+	} else {
+		len = 16;
+		ret = inet_pton(AF_INET6, target, addrbuf);
+		assert(ret == 1);
+	}
+
+	res = NULL;
+	ret = lwres_getnamebyaddr(ctx, af, len, addrbuf, &res);
+	if (ret != expected) {
+		printf("I:gnba(%s) failed: %d\n", target, ret);
+		if (res != NULL)
+			lwres_gnbaresponse_free(ctx, &res);
+		fails++;
+		return;
+	}
+	if (ret == LWRES_R_SUCCESS && strcasecmp(res->realname, name) != 0) {
+		 printf("I:gnba(%s) returned %s, expected %s\n",
+			target, res->realname, name);
+		 fails++;
+		 return;
+	}
+	if (res != NULL)
+		lwres_gnbaresponse_free(ctx, &res);
+}
+
+static void
+test_gethostbyname(const char *name, const char *address) {
+	struct hostent *hp;
+	unsigned char addrbuf[16];
+	int ret;
+
+	hp = gethostbyname(name);
+	if (hp == NULL) {
+		if (address == NULL && h_errno == HOST_NOT_FOUND)
+			return;
+		else if (h_errno != HOST_NOT_FOUND) {
+			printf("I:gethostbyname(%s) failed: %s\n",
+			       name, hstrerror(h_errno));
+			fails++;
+			return;
+		} else {
+			printf("I:gethostbyname(%s) returned not found\n",
+			       name);
+			fails++;
+			return;
+		}
+	} else {
+		ret = inet_pton(AF_INET, address, addrbuf);
+		assert(ret == 1);
+		if (memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0) {
+			char outbuf[16];
+			(void)inet_ntop(AF_INET, hp->h_addr_list[0],
+					outbuf, sizeof(outbuf));
+			printf("I:gethostbyname(%s) returned %s, "
+			       "expected %s\n", name, outbuf, address);
+			fails++;
+			return;
+		}
+	}
+}
+
+static void
+test_gethostbyname2(const char *name, const char *address, int af) {
+	struct hostent *hp;
+	unsigned char addrbuf[16];
+	int len, ret;
+
+	hp = gethostbyname2(name, af);
+	if (hp == NULL) {
+		if (address == NULL && h_errno == HOST_NOT_FOUND)
+			return;
+		else if (h_errno != HOST_NOT_FOUND) {
+			printf("I:gethostbyname(%s) failed: %s\n",
+			       name, hstrerror(h_errno));
+			fails++;
+			return;
+		} else {
+			printf("I:gethostbyname(%s) returned not found\n",
+			       name);
+			fails++;
+			return;
+		}
+	} else {
+		if (af == AF_INET)
+			len = 4;
+		else
+			len = 16;
+		ret = inet_pton(af, address, addrbuf);
+		assert(ret == 1);
+		if (hp->h_addrtype != af) {
+			printf("I:gethostbyname(%s) returned wrong family\n",
+			       name);
+			fails++;
+			return;
+		}
+		if (len != (int)hp->h_length ||
+		    memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0)
+		{
+			char outbuf[16];
+			(void)inet_ntop(af, hp->h_addr_list[0],
+					outbuf, sizeof(outbuf));
+			printf("I:gethostbyname(%s) returned %s, "
+			       "expected %s\n", name, outbuf, address);
+			fails++;
+			return;
+		}
+	}
+}
+
+static void
+test_getipnodebyname(const char *name, const char *address, int af,
+		     int v4map, int all)
+{
+	struct hostent *hp;
+	unsigned char addrbuf[16];
+	int len, ret;
+	int error_num;
+	int flags = 0;
+
+	if (v4map)
+		flags |= AI_V4MAPPED;
+	if (all)
+		flags |= AI_ALL;
+
+	hp = getipnodebyname(name, af, flags, &error_num);
+	if (hp == NULL) {
+		if (address == NULL && error_num == HOST_NOT_FOUND)
+			return;
+		else if (error_num != HOST_NOT_FOUND) {
+			printf("I:getipnodebyname(%s) failed: %d\n",
+			       name, error_num);
+			fails++;
+			return;
+		} else {
+			printf("I:getipnodebyname(%s) returned not found\n",
+			       name);
+			fails++;
+			return;
+		}
+	} else {
+		if (af == AF_INET)
+			len = 4;
+		else
+			len = 16;
+		ret = inet_pton(af, address, addrbuf);
+		assert(ret == 1);
+		if (hp->h_addrtype != af) {
+			printf("I:getipnodebyname(%s) returned wrong family\n",
+			       name);
+			freehostent(hp);
+			fails++;
+			return;
+		}
+		if (len != (int)hp->h_length ||
+		    memcmp(hp->h_addr_list[0], addrbuf, hp->h_length) != 0)
+		{
+			char outbuf[16];
+			(void)inet_ntop(af, hp->h_addr_list[0],
+					outbuf, sizeof(outbuf));
+			printf("I:getipnodebyname(%s) returned %s, "
+			       "expected %s\n", name, outbuf, address);
+			freehostent(hp);
+			fails++;
+			return;
+		}
+		freehostent(hp);
+	}
+}
+
+static void
+test_gethostbyaddr(const char *address, int af, const char *name) {
+	struct hostent *hp;
+	char addrbuf[16];
+	int len, ret;
+
+	if (af == AF_INET)
+		len = 4;
+	else
+		len = 16;
+	ret = inet_pton(af, address, addrbuf);
+	assert(ret == 1);
+
+	hp = gethostbyaddr(addrbuf, len, af);
+
+	if (hp == NULL) {
+		if (name == NULL && h_errno == HOST_NOT_FOUND)
+			return;
+		else if (h_errno != HOST_NOT_FOUND) {
+			printf("I:gethostbyaddr(%s) failed: %s\n",
+			       address, hstrerror(h_errno));
+			fails++;
+			return;
+		} else {
+			printf("I:gethostbyaddr(%s) returned not found\n",
+			       address);
+			fails++;
+			return;
+		}
+	} else {
+		if (name != NULL && strcmp(hp->h_name, name) != 0) {
+			printf("I:gethostbyname(%s) returned %s, "
+			       "expected %s\n", address, hp->h_name, name);
+			fails++;
+			return;
+		}
+	}
+}
+
+static void
+test_getipnodebyaddr(const char *address, int af, const char *name) {
+	struct hostent *hp;
+	char addrbuf[16];
+	int len, ret;
+	int error_num;
+
+	if (af == AF_INET)
+		len = 4;
+	else
+		len = 16;
+	ret = inet_pton(af, address, addrbuf);
+	assert(ret == 1);
+
+	hp = getipnodebyaddr(addrbuf, len, af, &error_num);
+
+	if (hp == NULL) {
+		if (name == NULL && error_num == HOST_NOT_FOUND)
+			return;
+		else if (error_num != HOST_NOT_FOUND) {
+			printf("I:getipnodebyaddr(%s) failed: %d\n",
+			       address, error_num);
+			fails++;
+			return;
+		} else {
+			printf("I:getipnodebyaddr(%s) returned not found\n",
+			       address);
+			fails++;
+			return;
+		}
+	} else {
+		if (name != NULL && strcmp(hp->h_name, name) != 0) {
+			printf("I:getipnodebyaddr(%s) returned %s, "
+			       "expected %s\n", address, hp->h_name, name);
+			freehostent(hp);
+			fails++;
+			return;
+		}
+		freehostent(hp);
+	}
+}
+
+static void
+test_getaddrinfo(const char *name, int af, int v4ok, int v6ok,
+		   const char *address)
+{
+	unsigned int len;
+	int ret;
+	struct addrinfo *ai;
+	struct addrinfo hint;
+	unsigned char addrbuf[16];
+
+	if (v4ok == 1 && v6ok== 1) {
+		ret = getaddrinfo(name, NULL, NULL, &ai);
+	} else {
+		memset(&hint, 0, sizeof(hint));
+		if (v4ok)
+			hint.ai_family = AF_INET;
+		else
+			hint.ai_family = AF_INET6;
+		ret = getaddrinfo(name, NULL, &hint, &ai);
+	}
+	if (ret != 0) {
+		if (address == NULL && ret == EAI_NODATA)
+			return;
+		else if (ret != EAI_NODATA) {
+			printf("I:getaddrinfo(%s,%d,%d) failed: %s\n",
+			       name, v4ok, v6ok, gai_strerror(ret));
+			fails++;
+			return;
+		} else {
+			printf("I:getaddrinfo(%s,%d,%d) returned not found\n",
+			       name, v4ok, v6ok);
+			fails++;
+			return;
+		}
+	} else {
+		if (af == AF_INET)
+			len = sizeof(struct sockaddr_in);
+		else
+			len = sizeof(struct sockaddr_in6);
+		ret = inet_pton(af, address, addrbuf);
+		assert(ret == 1);
+		if (ai->ai_family != af) {
+			printf("I:getaddrinfo(%s) returned wrong family\n",
+			       name);
+			fails++;
+			freeaddrinfo(ai);
+			return;
+		}
+		if (len != (unsigned int) ai->ai_addrlen) {
+			char outbuf[16];
+			(void)inet_ntop(af, ai->ai_addr,
+					outbuf, sizeof(outbuf));
+			printf("I:getaddrinfo(%s) returned %lub, "
+			       "expected %ub\n", name,
+				(unsigned long)ai->ai_addrlen, len);
+			fails++;
+			freeaddrinfo(ai);
+			return;
+		} else if (af == AF_INET) {
+			struct sockaddr_in *sin;
+			sin = (struct sockaddr_in *) ai->ai_addr;
+			if (memcmp(&sin->sin_addr.s_addr, addrbuf, 4) != 0) {
+				char outbuf[16];
+				(void)inet_ntop(af, &sin->sin_addr.s_addr,
+						outbuf, sizeof(outbuf));
+				printf("I:getaddrinfo(%s) returned %s, "
+				       "expected %s\n", name, outbuf, address);
+				fails++;
+				freeaddrinfo(ai);
+				return;
+			}
+		} else {
+			struct sockaddr_in6 *sin6;
+			sin6 = (struct sockaddr_in6 *) ai->ai_addr;
+			if (memcmp(sin6->sin6_addr.s6_addr, addrbuf, 16) != 0)
+			{
+				char outbuf[16];
+				(void)inet_ntop(af, &sin6->sin6_addr.s6_addr,
+						outbuf, sizeof(outbuf));
+				printf("I:getaddrinfo(%s) returned %s, "
+				       "expected %s\n", name, outbuf, address);
+				fails++;
+				freeaddrinfo(ai);
+				return;
+			}
+		}
+		freeaddrinfo(ai);
+	}
+}
+
+static void
+test_getnameinfo(const char *address, int af, const char *name) {
+	int ret;
+	struct sockaddr_in sin;
+	struct sockaddr_in6 sin6;
+	struct sockaddr *sa;
+	int salen;
+	char host[1025];
+
+	if (af == AF_INET) {
+		memset(&sin, 0, sizeof(sin));
+		ret = inet_pton(AF_INET, address, &sin.sin_addr.s_addr);
+		assert(ret == 1);
+		sin.sin_family = AF_INET;
+#ifdef LWRES_PLATFORM_HAVESALEN
+		sin.sin_len = sizeof(sin);
+#endif
+		sa = (struct sockaddr *) &sin;
+		salen = sizeof(sin);
+	} else {
+		memset(&sin6, 0, sizeof(sin6));
+		ret = inet_pton(AF_INET6, address, sin6.sin6_addr.s6_addr);
+		assert(ret == 1);
+		sin6.sin6_family = AF_INET6;
+#ifdef LWRES_PLATFORM_HAVESALEN
+		sin6.sin6_len = sizeof(sin6);
+#endif
+		sa = (struct sockaddr *) &sin6;
+		salen = sizeof(sin6);
+	}
+	sa->sa_family = af;
+
+	ret = getnameinfo(sa, salen, host, sizeof(host), NULL, 0, NI_NAMEREQD);
+
+	if (ret != 0) {
+		if (name == NULL && ret == ENI_NOHOSTNAME)
+			return;
+		else if (ret != ENI_NOHOSTNAME) {
+			printf("I:getnameinfo(%s) failed: %d\n",
+			       address, ret);
+			fails++;
+			return;
+		} else {
+			printf("I:getnameinfo(%s) returned not found\n",
+			       address);
+			fails++;
+			return;
+		}
+	} else {
+		if (name == NULL) {
+			printf("I:getnameinfo(%s) returned %s, "
+			       "expected NULL\n", address, host);
+			fails++;
+			return;
+		} else if (strcmp(host, name) != 0) {
+			printf("I:getnameinfo(%s) returned %s, expected %s\n",
+			       address, host, name);
+			fails++;
+			return;
+		}
+	}
+}
+
+static void
+test_getrrsetbyname(const char *name, int rdclass, int rdtype,
+		    unsigned int nrdatas, unsigned int nsigs,
+		    int should_pass)
+{
+	int ret;
+	struct rrsetinfo *rrinfo = NULL;
+	ret = getrrsetbyname(name, rdclass, rdtype, 0, &rrinfo);
+	if (ret != 0 && should_pass == 1) {
+		printf("I:getrrsetbyname(%s, %d) failed\n", name, rdtype);
+		fails++;
+		return;
+	} else if (ret == 0 && should_pass == 0) {
+		printf("I:getrrsetbyname(%s, %d) unexpectedly succeeded\n",
+			name, rdtype);
+		fails++;
+		freerrset(rrinfo);
+		return;
+	} else if (ret != 0)
+		return;
+	if (rrinfo->rri_nrdatas != nrdatas) {
+		printf("I:getrrsetbyname(%s, %d): got %d rr, expected %d\n",
+			name, rdtype, rrinfo->rri_nrdatas, nrdatas);
+		fails++;
+	}
+	if (rrinfo->rri_nsigs != nsigs) {
+		printf("I:getrrsetbyname(%s, %d): got %d sig, expected %d\n",
+			name, rdtype, rrinfo->rri_nsigs, nsigs);
+		fails++;
+	}
+	freerrset(rrinfo);
+	return;
+}
+
+int
+main(int argc, char **argv) {
+	lwres_result_t ret;
+	int nosearch = 0;
+
+	UNUSED(argc);
+
+	lwres_udp_port = 9210;
+	lwres_resolv_conf = "resolv.conf";
+
+	if (argv[1] != NULL && strcmp(argv[1], "-nosearch") == 0)
+		nosearch = 1;
+
+	ret = lwres_context_create(&ctx, NULL, NULL, NULL, 0);
+	CHECK(ret, "lwres_context_create");
+
+	ret = lwres_conf_parse(ctx, "resolv.conf");
+	CHECK(ret, "lwres_conf_parse");
+
+	test_noop();
+
+	test_gabn("a.example1", LWRES_R_SUCCESS, "10.0.1.1",
+		  LWRES_ADDRTYPE_V4);
+	test_gabn("a.example1.", LWRES_R_SUCCESS, "10.0.1.1",
+		  LWRES_ADDRTYPE_V4);
+	test_gabn("a.example2", LWRES_R_SUCCESS, "10.0.2.1",
+		  LWRES_ADDRTYPE_V4);
+	test_gabn("a.example2.", LWRES_R_SUCCESS, "10.0.2.1",
+		  LWRES_ADDRTYPE_V4);
+	test_gabn("a.example3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+	test_gabn("a.example3.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+	if (nosearch)
+		test_gabn("a", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+	else
+		test_gabn("a", LWRES_R_SUCCESS, "10.0.1.1", LWRES_ADDRTYPE_V4);
+	test_gabn("a.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+
+	if (nosearch)
+		test_gabn("a2", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+	else
+		test_gabn("a2", LWRES_R_SUCCESS, "10.0.1.1", LWRES_ADDRTYPE_V4);
+	test_gabn("a3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V4);
+
+	test_gabn("b.example1", LWRES_R_SUCCESS,
+		  "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+		  LWRES_ADDRTYPE_V6);
+	test_gabn("b.example1.", LWRES_R_SUCCESS,
+		  "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+		  LWRES_ADDRTYPE_V6);
+	test_gabn("b.example2", LWRES_R_SUCCESS,
+		  "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+		  LWRES_ADDRTYPE_V6);
+	test_gabn("b.example2.", LWRES_R_SUCCESS,
+		  "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+		  LWRES_ADDRTYPE_V6);
+	test_gabn("b.example3", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6);
+	test_gabn("b.example3.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6);
+	if (nosearch)
+		test_gabn("b", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6);
+	else
+		test_gabn("b", LWRES_R_SUCCESS,
+			  "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+			  LWRES_ADDRTYPE_V6);
+	test_gabn("b.", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6);
+
+	test_gabn("d.example1", LWRES_R_NOTFOUND, NULL, LWRES_ADDRTYPE_V6);
+
+	test_gabn("x", LWRES_R_SUCCESS, "10.1.10.1", LWRES_ADDRTYPE_V4);
+	test_gabn("x.", LWRES_R_SUCCESS, "10.1.10.1", LWRES_ADDRTYPE_V4);
+
+	test_gnba("10.10.10.1", LWRES_ADDRTYPE_V4, LWRES_R_SUCCESS,
+		  "ipv4.example");
+	test_gnba("10.10.10.17", LWRES_ADDRTYPE_V4, LWRES_R_NOTFOUND,
+		  NULL);
+	test_gnba("0123:4567:89ab:cdef:0123:4567:89ab:cdef",
+		  LWRES_ADDRTYPE_V6, LWRES_R_SUCCESS, "ip6.int.example");
+	test_gnba("0123:4567:89ab:cdef:0123:4567:89ab:cde0",
+		  LWRES_ADDRTYPE_V6, LWRES_R_NOTFOUND, NULL);
+	test_gnba("1123:4567:89ab:cdef:0123:4567:89ab:cdef",
+		  LWRES_ADDRTYPE_V6, LWRES_R_SUCCESS, "ip6.arpa.example");
+	test_gnba("1123:4567:89ab:cdef:0123:4567:89ab:cde0",
+		  LWRES_ADDRTYPE_V6, LWRES_R_NOTFOUND, NULL);
+
+	test_gethostbyname("a.example1.", "10.0.1.1");
+	test_gethostbyname("q.example1.", NULL);
+
+	test_gethostbyname2("a.example1.", "10.0.1.1", AF_INET);
+	test_gethostbyname2("b.example1.",
+			    "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+			    AF_INET6);
+	test_gethostbyname2("q.example1.", NULL, AF_INET);
+
+	test_getipnodebyname("a.example1.", "10.0.1.1", AF_INET, 0, 0);
+	test_getipnodebyname("b.example1.",
+			     "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+			     AF_INET6, 0, 0);
+	test_getipnodebyname("a.example1.",
+			     "::ffff:10.0.1.1", AF_INET6, 1, 0);
+	test_getipnodebyname("a.example1.",
+			     "::ffff:10.0.1.1", AF_INET6, 1, 1);
+	test_getipnodebyname("b.example1.",
+			     "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff",
+			     AF_INET6, 1, 1);
+	test_getipnodebyname("q.example1.", NULL, AF_INET, 0, 0);
+
+	test_gethostbyaddr("10.10.10.1", AF_INET, "ipv4.example");
+	test_gethostbyaddr("10.10.10.17", AF_INET, NULL);
+	test_gethostbyaddr("0123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			   AF_INET6, "ip6.int.example");
+	test_gethostbyaddr("1123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			   AF_INET6, "ip6.arpa.example");
+
+	test_getipnodebyaddr("10.10.10.1", AF_INET, "ipv4.example");
+	test_getipnodebyaddr("10.10.10.17", AF_INET, NULL);
+	test_getipnodebyaddr("0123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			     AF_INET6, "ip6.int.example");
+	test_getipnodebyaddr("1123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			     AF_INET6, "ip6.arpa.example");
+
+	test_getaddrinfo("a.example1.", AF_INET, 1, 1, "10.0.1.1");
+	test_getaddrinfo("a.example1.", AF_INET, 1, 0, "10.0.1.1");
+	test_getaddrinfo("a.example1.", AF_INET, 0, 1, NULL);
+	test_getaddrinfo("b.example1.", AF_INET6, 1, 1,
+			 "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff");
+	test_getaddrinfo("b.example1.", AF_INET6, 1, 0, NULL);
+	test_getaddrinfo("b.example1.", AF_INET6, 0, 1,
+			 "eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff");
+
+	test_getnameinfo("10.10.10.1", AF_INET, "ipv4.example");
+	test_getnameinfo("10.10.10.17", AF_INET, NULL);
+	test_getnameinfo("0123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			 AF_INET6, "ip6.int.example");
+	test_getnameinfo("1123:4567:89ab:cdef:0123:4567:89ab:cdef",
+			 AF_INET6, "ip6.arpa.example");
+	test_getnameinfo("1122:3344:5566:7788:99aa:bbcc:ddee:ff00",
+			 AF_INET6, "dname.example1");
+
+	if (nosearch)
+		test_getrrsetbyname("a", 1, 1, 0, 0, 0);
+	else
+		test_getrrsetbyname("a", 1, 1, 1, 0, 1);
+	test_getrrsetbyname("a.example1.", 1, 1, 1, 0, 1);
+	test_getrrsetbyname("e.example1.", 1, 1, 1, 1, 1);
+	test_getrrsetbyname("e.example1.", 1, 255, 1, 1, 0);
+	test_getrrsetbyname("e.example1.", 1, 2, 1, 1, 1);
+	test_getrrsetbyname("e.example1.", 1, 46, 2, 0, 1);
+	test_getrrsetbyname("", 1, 1, 0, 0, 0);
+
+	test_getrrsetbyname("123456789.123456789.123456789.123456789."
+			    "123456789.123456789.123456789.123456789."
+			    "123456789.123456789.123456789.123456789."
+			    "123456789.123456789.123456789.123456789."
+			    "123456789.123456789.123456789.123456789."
+			    "123456789.123456789.123456789.123456789."
+			    "123456789", 1, 1, 0, 0, 0);
+
+	if (fails == 0)
+		printf("I:ok\n");
+	return (fails);
+}
diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
new file mode 100644
index 0000000..dcd8915
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
@@ -0,0 +1,23 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+; $Id: 10.10.10.in-addr.arpa.db,v 1.10 2007/06/19 23:47:04 tbox Exp $
+
+$TTL 300	; 5 minutes
+@	IN SOA  mname1. . (
+		2000062001	; serial
+		20		; refresh (20 seconds)
+		20		; retry (20 seconds)
+		1814400		; expire (3 weeks)
+		3600		; minimum (1 hour)
+		)
+	NS	ns
+ns	A	10.53.0.1
+
+1	PTR	ipv4.example.
diff --git a/bin/tests/system/lwresd/ns1/e.example1.db b/bin/tests/system/lwresd/ns1/e.example1.db
new file mode 100644
index 0000000..2d9587c
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/e.example1.db
@@ -0,0 +1,54 @@
+; File written on Wed Mar  5 10:20:40 2008
+; dnssec_signzone version 9.3.4-P1
+e.example1.		300	IN SOA	mname1. . (
+					2002082210 ; serial
+					20         ; refresh (20 seconds)
+					20         ; retry (20 seconds)
+					1814400    ; expire (3 weeks)
+					3600       ; minimum (1 hour)
+					)
+			300	RRSIG	SOA 5 2 300 20010101000000 (
+					20000101000000 14043 e.example1.
+					KtYwrnKM7Tu53BNf8XuTix53r9kDdCneJ1X7
+					xklFbp4YjRKC3NhwVK9PFe0jdHOkIDMtrwxn
+					n7/Rp07xIyURqw== )
+			300	NS	ns.e.example1.
+			300	RRSIG	NS 5 2 300 20010101000000 (
+					20000101000000 14043 e.example1.
+					KBPx3XmNl4swVPdwuUEFuzZedMSfsyK2a0Fu
+					o2wBnbCuS7G7DtfW9690lP/eTyixLOIwlFLQ
+					MrjN3+XgpkdgIw== )
+			300	A	10.0.1.1
+			300	RRSIG	A 5 2 300 20010101000000 (
+					20000101000000 14043 e.example1.
+					KYlxMQUvv8DQtVgS23lNL5tFYmRppJ7vTgH3
+					btvgKbyHxW/04ewRsgCa82iu3iJipdEhKM11
+					ALkRNhqL7frnig== )
+			3600	NSEC	ns.e.example1. A NS SOA RRSIG NSEC DNSKEY
+			3600	RRSIG	NSEC 5 2 3600 20010101000000 (
+					20000101000000 14043 e.example1.
+					azSgagb7bldM06qSZg8nDZWOY2FbqeZY0/T8
+					nC+6VhCs7YTfNvXynLWmvmpqL7gVT6/O+Yi2
+					2lmdntld7GORrQ== )
+			300	DNSKEY	256 3 5 (
+					AwEAAcvAUMfH7wA0z077fJaF7RMrxAFyvo0/
+					7aAL4d2/yA5TqTaUCVnJtE+XgGO34kH9mwae
+					we+Nyv2kRWDeLl6nhGk=
+					) ; key id = 14043
+			300	RRSIG	DNSKEY 5 2 300 20010101000000 (
+					20000101000000 14043 e.example1.
+					BQFWOHopXuBNdzcopkdl1YVKGF0QvIaYpywM
+					fcpG5gi+sy9EoTofQ1UGsLOjU3nFXCvJFG4K
+					1gUhzEEti440/g== )
+ns.e.example1.		300	IN A	10.53.0.1
+			300	RRSIG	A 5 3 300 20010101000000 (
+					20000101000000 14043 e.example1.
+					cYPzsWNQ/eL4h2lihKRjKT2jhGpOqV9woGJA
+					/Jstx2iethOAvYtgY22CsAbCUr/6E4bSgBZR
+					TMoC604cNdFzIw== )
+			3600	NSEC	e.example1. A RRSIG NSEC
+			3600	RRSIG	NSEC 5 3 3600 20010101000000 (
+					20000101000000 14043 e.example1.
+					J8Md544zDLP4GjyAtkjH/rSFvpzXY/7bgJRS
+					YDoARwFQRmlrJvavXEjqElb2fTQqlNNz1cal
+					QROz/WJ3GLwOWw== )
diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db
new file mode 100644
index 0000000..c2f0d80
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/example1.db
@@ -0,0 +1,29 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+; $Id: example1.db,v 1.19 2008/04/02 23:46:57 tbox Exp $
+
+$TTL 300	; 5 minutes
+@			IN SOA	mname1. . (
+				2002082210 ; serial
+				20         ; refresh (20 seconds)
+				20         ; retry (20 seconds)
+				1814400    ; expire (3 weeks)
+				3600       ; minimum (1 hour)
+				)
+			NS	ns
+ns			A	10.53.0.1
+
+a			A	10.0.1.1
+a2			CNAME	a
+a3			CNAME	nowhere
+b			AAAA	eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff
+8.8.7.7			DNAME	net
+0.0.f.f.e.e.d.d.c.c.b.b.a.a.9.9.net PTR     dname
+e			NS	ns.e
diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db
new file mode 100644
index 0000000..1eeedcd
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/example2.db
@@ -0,0 +1,24 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+; $Id: example2.db,v 1.10 2007/06/19 23:47:04 tbox Exp $
+
+$TTL 300	; 5 minutes
+@			IN SOA	mname1. . (
+				2000062001 ; serial
+				20         ; refresh (20 seconds)
+				20         ; retry (20 seconds)
+				1814400    ; expire (3 weeks)
+				3600       ; minimum (1 hour)
+				)
+			NS	ns
+ns			A	10.53.0.1
+
+a			A	10.0.2.1
+b			AAAA	eeee:eeee:eeee:eeee:ffff:ffff:ffff:ffff
diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db
new file mode 100644
index 0000000..dbcfe22
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/ip6.arpa.db
@@ -0,0 +1,24 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+; $Id: ip6.arpa.db,v 1.11 2007/06/19 23:47:04 tbox Exp $
+
+$TTL 300	; 5 minutes
+@	IN SOA  mname1. . (
+		2002082300	; serial
+		20		; refresh (20 seconds)
+		20		; retry (20 seconds)
+		1814400		; expire (3 weeks)
+		3600		; minimum (1 hour)
+		)
+	NS	ns
+ns	A	10.53.0.1
+
+f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.1 PTR ip6.arpa.example.
+6.6.5.5.4.4.3.3.2.2.1.1 DNAME example1.
diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db
new file mode 100644
index 0000000..e2675c6
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/ip6.int.db
@@ -0,0 +1,21 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+$TTL 300	; 5 minutes
+@	IN SOA  mname1. . (
+		2002082300	; serial
+		20		; refresh (20 seconds)
+		20		; retry (20 seconds)
+		1814400		; expire (3 weeks)
+		3600		; minimum (1 hour)
+		)
+	NS	ns
+ns	A	10.53.0.1
+
+f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0.f.e.d.c.b.a.9.8.7.6.5.4.3.2.1.0	PTR ip6.int.example.
diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf
new file mode 100644
index 0000000..7e9e448
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/named.conf
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/* $Id: named.conf,v 1.21 2008/04/02 23:46:57 tbox Exp $ */
+
+controls { /* empty */ };
+
+options {
+	query-source address 10.53.0.1;
+	notify-source 10.53.0.1;
+	transfer-source 10.53.0.1;
+	port 5300;
+	pid-file "named.pid";
+	listen-on { 10.53.0.1; };
+	listen-on-v6 { none; };
+	recursion no;
+	notify no;
+	dnssec-enable yes;
+	dnssec-validation yes;
+};
+
+zone "." {
+	type master;
+	file "root.db";
+};
+
+zone "example1." {
+	type master;
+	file "example1.db";
+};
+
+zone "e.example1." {
+	type master;
+	file "e.example1.db";
+};
+
+zone "example2." {
+	type master;
+	file "example2.db";
+};
+
+zone "10.10.10.in-addr.arpa." {
+	type master;
+	file "10.10.10.in-addr.arpa.db";
+};
+
+zone "ip6.int." {
+	type master;
+	file "ip6.int.db";
+};
+
+zone "ip6.arpa." {
+	type master;
+	file "ip6.arpa.db";
+};
diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db
new file mode 100644
index 0000000..e903f66
--- /dev/null
+++ b/bin/tests/system/lwresd/ns1/root.db
@@ -0,0 +1,27 @@
+; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+;
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;
+; See the COPYRIGHT file distributed with this work for additional
+; information regarding copyright ownership.
+
+; $Id: root.db,v 1.9 2007/06/19 23:47:04 tbox Exp $
+
+$TTL 300
+. 			IN SOA	gson.nominum.com. a.root.servers.nil. (
+				2000042100   	; serial
+				600         	; refresh
+				600         	; retry
+				1200    	; expire
+				600       	; minimum
+				)
+.			NS	a.root-servers.nil.
+a.root-servers.nil.	A	10.53.0.1
+
+example1.		NS	ns.example1.
+ns.example1.		A	10.53.0.2
+example2.		NS	ns.example2.
+ns.example2.		A	10.53.0.2
+x			A	10.1.10.1
diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf
new file mode 100644
index 0000000..0d6f111
--- /dev/null
+++ b/bin/tests/system/lwresd/resolv.conf
@@ -0,0 +1,15 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# $Id: resolv.conf,v 1.11 2007/06/19 23:47:04 tbox Exp $
+
+nameserver 10.53.0.1
+lwserver 10.53.0.1
+search example1.
+ndots 1
diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
new file mode 100644
index 0000000..e753ce1
--- /dev/null
+++ b/bin/tests/system/lwresd/tests.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+#
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+# $Id: tests.sh,v 1.22 2012/02/03 23:46:58 tbox Exp $
+
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+status=0
+echo "I:waiting for nameserver to load"
+for i in 0 1 2 3 4 5 6 7 8 9
+do
+	ret=0
+	for zone in . example1 e.example1 example2 10.10.10.in-addr.arpa \
+	    ip6.int ip6.arpa
+	do
+		$DIG +tcp -p 5300 @10.53.0.1 soa $zone > dig.out
+		grep "status: NOERROR" dig.out > /dev/null || ret=1
+		grep "ANSWER: 1," dig.out > /dev/null || ret=1
+	done
+	test $ret = 0 && break
+	sleep 1
+done
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
+echo "I:using resolv.conf"
+ret=0
+for i in 0 1 2 3 4 5 6 7 8 9 
+do
+	grep ' running$' lwresd1/lwresd.run > /dev/null && break
+	sleep 1
+done
+$LWTEST || ret=1
+if [ $ret != 0 ]; then
+	echo "I:failed"
+fi
+status=`expr $status + $ret`
+
+$PERL $SYSTEMTESTTOP/stop.pl . lwresd1
+
+mv lwresd1/lwresd.run lwresd1/lwresd.run.resolv
+
+$PERL $SYSTEMTESTTOP/start.pl . lwresd1 -- "-X lwresd.lock -m record,size,mctx -c lwresd.conf -d 99 -g"
+
+echo "I:using lwresd.conf"
+ret=0
+for i in 0 1 2 3 4 5 6 7 8 9 
+do
+	grep ' running$' lwresd1/lwresd.run > /dev/null && break
+	sleep 1
+done
+$LWTEST || ret=1
+if [ $ret != 0 ]; then
+	echo "I:failed"
+fi
+status=`expr $status + $ret`
+
+$PERL $SYSTEMTESTTOP/stop.pl . lwresd1
+
+mv lwresd1/lwresd.run lwresd1/lwresd.run.lwresd
+
+$PERL $SYSTEMTESTTOP/start.pl . lwresd1 -- "-X lwresd.lock -m record,size,mctx -c nosearch.conf -d 99 -g"
+
+echo "I:using nosearch.conf"
+ret=0
+for i in 0 1 2 3 4 5 6 7 8 9 
+do
+	grep ' running$' lwresd1/lwresd.run > /dev/null && break
+	sleep 1
+done
+$LWTEST -nosearch || ret=1
+if [ $ret != 0 ]; then
+	echo "I:failed"
+fi
+status=`expr $status + $ret`
+
+echo "I:exit status: $status"
+[ $status -eq 0 ] || exit 1