Commit a85477a8ae796594d0c25b39bfe0c5f04d7adb41 - unbound

Imported Upstream version 1.4.12 Robert S. Edmonds 12 years ago

20 changed file(s) with 161 addition(s) and 356 deletion(s). Raw diff Collapse all Expand all

+19

-41

Makefile.in less more

191	191
192	192	$(BUILD)%.o: $(srcdir)/%.rc $(srcdir)/config.h
193	193	$(INFO) Resource $<
194		@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
195		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
196	194	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
197	195	$Q$(WINDRES) $(CPPFLAGS) $< $@
198	196	endif

201	199	LINK=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(staticexe) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS))
202	200	LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined)
203	201
204		.PHONY: clean realclean doc lint all install uninstall tests test download_ldns strip lib longtest longcheck check
	202	.PHONY: clean realclean doc lint all install uninstall tests test strip lib longtest longcheck check
205	203
206	204	$(BUILD)%.lo: $(srcdir)/%.c
207	205	$(INFO) Build $<
208		@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
209		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
210	206	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
211	207	$Q$(COMPILE) -o $@ -c $<
212	208

229	225	if test -x "`which bash`"; then bash testcode/do-tests.sh; else sh testcode/do-tests.sh; fi
230	226
231	227	lib: libunbound.la
232
233		ifeq ($(patsubst ldns-src%,ldns-src,$(ldnsdir)),ldns-src)
234		ldnslib=$(ldnsdir)/lib/libldns.a
235		$(ldnslib): $(ldnsdir)/lib
236		$(ldnsdir)/lib:
237		@if test ! -z "$(ldnsdir)"; \
238		then (cd $(ldnsdir) && $(MAKE)); fi
239		else
240		ldnslib=
241		endif
242	228
243	229	UBSYMS+=-export-symbols $(srcdir)/libunbound/ubsyms.def
244	230	CLUBSYMS=-export-symbols $(BUILD)clubsyms.def

249	235	EXTRALINK=-L. -L.libs -lunbound
250	236	endif
251	237
252		libunbound.la: $(LIBUNBOUND_OBJ) $(ldnslib)
	238	libunbound.la: $(LIBUNBOUND_OBJ)
253	239	$(INFO) Link $@
254	240	ifeq ($(CHECKLOCK_SRC),)
255	241	$Q$(LINK_LIB) $(UBSYMS) -o $@ $(sort $(LIBUNBOUND_OBJ)) -rpath $(libdir) $(LIBS)

268	254	$Q$(LINK_LIB) $(CLUBSYMS) -o $@ $(sort $(LIBUNBOUND_OBJ)) -rpath $(libdir) $(LIBS)
269	255	endif
270	256
271		unbound$(EXEEXT): $(DAEMON_OBJ) libunbound.la $(ldnslib)
	257	unbound$(EXEEXT): $(DAEMON_OBJ) libunbound.la
272	258	$(INFO) Link $@
273	259	$Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -lssl $(LIBS)
274	260
275		unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ) libunbound.la $(ldnslib)
	261	unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ) libunbound.la
276	262	$(INFO) Link $@
277	263	$Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) $(EXTRALINK) -lssl $(LIBS)
278	264
279		unbound-control$(EXEEXT): $(CONTROL_OBJ) libunbound.la $(ldnslib)
	265	unbound-control$(EXEEXT): $(CONTROL_OBJ) libunbound.la
280	266	$(INFO) Link $@
281	267	$Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) $(EXTRALINK) -lssl $(LIBS)
282	268
283		unbound-host$(EXEEXT): $(HOST_OBJ) libunbound.la $(ldnslib)
	269	unbound-host$(EXEEXT): $(HOST_OBJ) libunbound.la
284	270	$(INFO) Link $@
285	271	$Q$(LINK) -o $@ $(sort $(HOST_OBJ)) -L. -L.libs -lunbound $(LIBS)
286	272
287		unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ) libunbound.la $(ldnslib)
	273	unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ) libunbound.la
288	274	$(INFO) Link $@
289	275	$Q$(LINK) -o $@ $(sort $(UBANCHOR_OBJ)) -L. -L.libs -lunbound -lexpat -lssl $(LIBS)
290	276

296	282	$(INFO) Link $@
297	283	$Q$(LINK) -o $@ $(sort $(SVCUNINST_OBJ)) $(LIBS)
298	284
299		anchor-update$(EXEEXT): $(ANCHORUPD_OBJ) libunbound.la $(ldnslib)
	285	anchor-update$(EXEEXT): $(ANCHORUPD_OBJ) libunbound.la
300	286	$(INFO) Link $@
301	287	$Q$(LINK) -o $@ $(sort $(ANCHORUPD_OBJ)) -L. -L.libs -lunbound $(LIBS)
302	288
303		unittest$(EXEEXT): $(UNITTEST_OBJ) $(ldnslib)
	289	unittest$(EXEEXT): $(UNITTEST_OBJ)
304	290	$(INFO) Link $@
305	291	$Q$(LINK) -o $@ $(sort $(UNITTEST_OBJ)) $(LIBS)
306	292
307		testbound$(EXEEXT): $(TESTBOUND_OBJ) $(ldnslib)
	293	testbound$(EXEEXT): $(TESTBOUND_OBJ)
308	294	$(INFO) Link $@
309	295	$Q$(LINK) -o $@ $(sort $(TESTBOUND_OBJ)) -lssl $(LIBS)
310	296
311		lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ) $(ldnslib)
	297	lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ)
312	298	$(INFO) Link $@
313	299	$Q$(LINK) -o $@ $(sort $(LOCKVERIFY_OBJ)) $(LIBS)
314	300

316	302	$(INFO) Link $@
317	303	$Q$(LINK) -o $@ $(sort $(PETAL_OBJ)) -lssl $(LIBS)
318	304
319		pktview$(EXEEXT): $(PKTVIEW_OBJ) $(ldnslib)
	305	pktview$(EXEEXT): $(PKTVIEW_OBJ)
320	306	$(INFO) Link $@
321	307	$Q$(LINK) -o $@ $(sort $(PKTVIEW_OBJ)) $(LIBS)
322	308
323		signit$(EXEEXT): $(SIGNIT_OBJ) $(ldnslib)
	309	signit$(EXEEXT): $(SIGNIT_OBJ)
324	310	$(INFO) Link $@
325	311	$Q$(LINK) -o $@ $(sort $(SIGNIT_OBJ)) $(LIBS)
326	312
327		memstats$(EXEEXT): $(MEMSTATS_OBJ) $(ldnslib)
	313	memstats$(EXEEXT): $(MEMSTATS_OBJ)
328	314	$(INFO) Link $@
329	315	$Q$(LINK) -o $@ $(sort $(MEMSTATS_OBJ)) $(LIBS)
330	316
331		asynclook$(EXEEXT): $(ASYNCLOOK_OBJ) $(ldnslib) libunbound.la
	317	asynclook$(EXEEXT): $(ASYNCLOOK_OBJ) libunbound.la
332	318	$(INFO) Link $@
333	319	$Q$(LINK) -o $@ $(sort $(ASYNCLOOK_OBJ)) $(LIBS) -L. -L.libs -lunbound
334	320
335		streamtcp$(EXEEXT): $(STREAMTCP_OBJ) $(ldnslib)
	321	streamtcp$(EXEEXT): $(STREAMTCP_OBJ)
336	322	$(INFO) Link $@
337	323	$Q$(LINK) -o $@ $(sort $(STREAMTCP_OBJ)) $(LIBS)
338	324
339		perf$(EXEEXT): $(PERF_OBJ) $(ldnslib)
	325	perf$(EXEEXT): $(PERF_OBJ)
340	326	$(INFO) Link $@
341	327	$Q$(LINK) -o $@ $(sort $(PERF_OBJ)) $(LIBS)
342	328
343		delayer$(EXEEXT): $(DELAYER_OBJ) $(ldnslib)
	329	delayer$(EXEEXT): $(DELAYER_OBJ)
344	330	$(INFO) Link $@
345	331	$Q$(LINK) -o $@ $(sort $(DELAYER_OBJ)) $(LIBS)
346	332
347		harvest$(EXEEXT): $(HARVEST_OBJ) $(ldnslib) libunbound.la
	333	harvest$(EXEEXT): $(HARVEST_OBJ) libunbound.la
348	334	$(INFO) Link $@
349	335	$Q$(LINK) -o $@ $(sort $(HARVEST_OBJ)) $(LIBS) -L. -L.libs -lunbound
350	336

489	475	@echo
490	476	@echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand"
491	477
492		download_ldns:
493		svn export https://www.nlnetlabs.nl/svn/ldns/trunk/makedist.sh ldns_makedist.sh
494		./ldns_makedist.sh -s -d https://www.nlnetlabs.nl/svn/ldns/trunk
495		mv ldns-[0-9]*.tar.gz ldns-src.tar.gz
496		rm ldns-*.tar.gz.sha1 ldns_makedist.sh
497
498	478	iana_update:
499	479	curl -o port-numbers.tmp http://www.iana.org/assignments/port-numbers
500	480	awk '/Unassigned\|Reserved/ {next;} { match($$0, "[0-9]+/udp"); if (RLENGTH > 0) print substr($$0, RSTART, RLENGTH - 4) ","}' port-numbers.tmp \| sort -nu > portslist.tmp

504	484	# Automatic dependencies.
505	485	$(BUILD)%.d: $(srcdir)/%.c
506	486	$(INFO) Depend $<
507		@if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \
508		then (cd $(ldnsdir); $(MAKE) copy-headers); fi
509	487	@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
510	488	$Q$(SHELL) -ec '$(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) $< \| sed '\''s!$.$\.o[ :]!$(dir $@)\1.lo $@ : !g'\'' > $@; [ -s $@ ] \|\| rm -f $@'
511	489

+64

-233

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.66 for unbound 1.4.11.
	2	# Generated by GNU Autoconf 2.66 for unbound 1.4.12.
3	3	#
4	4	# Report bugs to <unbound-bugs@nlnetlabs.nl>.
5	5	#

561	561	# Identity of this package.
562	562	PACKAGE_NAME='unbound'
563	563	PACKAGE_TARNAME='unbound'
564		PACKAGE_VERSION='1.4.11'
565		PACKAGE_STRING='unbound 1.4.11'
	564	PACKAGE_VERSION='1.4.12'
	565	PACKAGE_STRING='unbound 1.4.12'
566	566	PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl'
567	567	PACKAGE_URL=''
568	568

602	602	# include <unistd.h>
603	603	#endif"
604	604
605		enable_option_checking=no
606	605	ac_subst_vars='LTLIBOBJS
607		subdirs
608	606	ldnsdir
609	607	EXPORT_ALL_SYMBOLS
610	608	WINDRES

758	756	enable_gost
759	757	with_libevent
760	758	with_libexpat
761		enable_staticexe
	759	enable_static_exe
762	760	enable_lock_checks
763	761	enable_alloc_checks
764	762	enable_alloc_lite
765	763	enable_alloc_nonregional
766	764	enable_allsymbols
767	765	with_ldns
768		with_ldns_builtin
769	766	'
770	767	ac_precious_vars='build_alias
771	768	host_alias

779	776	YACC
780	777	YFLAGS
781	778	PYTHON_VERSION'
782		ac_subdirs_all='ldns-src'
	779
783	780
784	781	# Initialize some variables set by options.
785	782	ac_init_help=

1320	1317	# Omit some internal or obsolete options to make the list less imposing.
1321	1318	# This message is too long to be a string in the A/UX 3.1 sh.
1322	1319	cat <<_ACEOF
1323		\`configure' configures unbound 1.4.11 to adapt to many kinds of systems.
	1320	\`configure' configures unbound 1.4.12 to adapt to many kinds of systems.
1324	1321
1325	1322	Usage: $0 [OPTION]... [VAR=VALUE]...
1326	1323

1386	1383
1387	1384	if test -n "$ac_init_help"; then
1388	1385	case $ac_init_help in
1389		short \| recursive ) echo "Configuration of unbound 1.4.11:";;
	1386	short \| recursive ) echo "Configuration of unbound 1.4.12:";;
1390	1387	esac
1391	1388	cat <<\_ACEOF
1392	1389

1462	1459	outgoing port ranges.
1463	1460	--with-libexpat=path specify explicit path for libexpat.
1464	1461	--with-ldns=PATH specify prefix of path of ldns library to use
1465		--with-ldns-builtin forces use of package included with this one
1466	1462
1467	1463	Some influential environment variables:
1468	1464	CC C compiler command

1549	1545	test -n "$ac_init_help" && exit $ac_status
1550	1546	if $ac_init_version; then
1551	1547	cat <<\_ACEOF
1552		unbound configure 1.4.11
	1548	unbound configure 1.4.12
1553	1549	generated by GNU Autoconf 2.66
1554	1550
1555	1551	Copyright (C) 2010 Free Software Foundation, Inc.

2018	2014	This file contains any messages produced by compilers while
2019	2015	running configure, to aid debugging if configure makes a mistake.
2020	2016
2021		It was created by unbound $as_me 1.4.11, which was
	2017	It was created by unbound $as_me 1.4.12, which was
2022	2018	generated by GNU Autoconf 2.66. Invocation command line was
2023	2019
2024	2020	$ $0 $@

2368	2364
2369	2365
2370	2366	LIBUNBOUND_CURRENT=2
2371		LIBUNBOUND_REVISION=11
	2367	LIBUNBOUND_REVISION=12
2372	2368	LIBUNBOUND_AGE=0
2373	2369	# 1.0.0 had 0:12:0
2374	2370	# 1.0.1 had 0:13:0

2395	2391	# 1.4.9 had 2:9:0
2396	2392	# 1.4.10 had 2:10:0
2397	2393	# 1.4.11 had 2:11:0
	2394	# 1.4.12 had 2:12:0
2398	2395
2399	2396	# Current -- the number of the binary API that we're implementing
2400	2397	# Revision -- which iteration of the implementation of the binary

15926	15923	# set static linking if requested
15927	15924
15928	15925	staticexe=""
15929		# Check whether --enable-staticexe was given.
15930		if test "${enable_staticexe+set}" = set; then :
15931		enableval=$enable_staticexe;
	15926	# Check whether --enable-static-exe was given.
	15927	if test "${enable_static_exe+set}" = set; then :
	15928	enableval=$enable_static_exe;
15932	15929	fi
15933	15930
15934	15931	if test x_$enable_static_exe = x_yes; then

16673	16670
16674	16671	# check this after all other compilation checks, since the linking of the lib
16675	16672	# may break checks after this.
16676		use_ldns_builtin="no"
16677	16673
16678	16674	# Check whether --with-ldns was given.
16679	16675	if test "${with_ldns+set}" = set; then :
16680		withval=$with_ldns; specialldnsdir="$withval"
	16676	withval=$with_ldns;
16681	16677	if test "$withval" != "yes"; then
16682	16678	if test "$withval" != "/usr" -a "$withval" != ""; then
16683	16679	CPPFLAGS="-I$withval/include $CPPFLAGS"

16697	16693	fi
16698	16694
16699	16695
16700
16701		# Check whether --with-ldns-builtin was given.
16702		if test "${with_ldns_builtin+set}" = set; then :
16703		withval=$with_ldns_builtin;
16704		use_ldns_builtin="yes"
16705
16706		fi
16707
16708
16709	16696	# check if ldns is good enough
16710		if test "$use_ldns_builtin" = "no"; then
16711		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns_buffer_copy in -lldns" >&5
16712		$as_echo_n "checking for ldns_buffer_copy in -lldns... " >&6; }
16713		if test "${ac_cv_lib_ldns_ldns_buffer_copy+set}" = set; then :
	16697	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns_rr_new in -lldns" >&5
	16698	$as_echo_n "checking for ldns_rr_new in -lldns... " >&6; }
	16699	if test "${ac_cv_lib_ldns_ldns_rr_new+set}" = set; then :
16714	16700	$as_echo_n "(cached) " >&6
16715	16701	else
16716	16702	ac_check_lib_save_LIBS=$LIBS

16724	16710	#ifdef __cplusplus
16725	16711	extern "C"
16726	16712	#endif
16727		char ldns_buffer_copy ();
	16713	char ldns_rr_new ();
16728	16714	int
16729	16715	main ()
16730	16716	{
16731		return ldns_buffer_copy ();
	16717	return ldns_rr_new ();
16732	16718	;
16733	16719	return 0;
16734	16720	}
16735	16721	_ACEOF
16736	16722	if ac_fn_c_try_link "$LINENO"; then :
16737		ac_cv_lib_ldns_ldns_buffer_copy=yes
16738		else
16739		ac_cv_lib_ldns_ldns_buffer_copy=no
	16723	ac_cv_lib_ldns_ldns_rr_new=yes
	16724	else
	16725	ac_cv_lib_ldns_ldns_rr_new=no
16740	16726	fi
16741	16727	rm -f core conftest.err conftest.$ac_objext \
16742	16728	conftest$ac_exeext conftest.$ac_ext
16743	16729	LIBS=$ac_check_lib_save_LIBS
16744	16730	fi
16745		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldns_ldns_buffer_copy" >&5
16746		$as_echo "$ac_cv_lib_ldns_ldns_buffer_copy" >&6; }
16747		if test "x$ac_cv_lib_ldns_ldns_buffer_copy" = x""yes; then :
	16731	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldns_ldns_rr_new" >&5
	16732	$as_echo "$ac_cv_lib_ldns_ldns_rr_new" >&6; }
	16733	if test "x$ac_cv_lib_ldns_ldns_rr_new" = x""yes; then :
16748	16734	cat >>confdefs.h <<_ACEOF
16749	16735	#define HAVE_LIBLDNS 1
16750	16736	_ACEOF
16751	16737
16752	16738	LIBS="-lldns $LIBS"
16753	16739
16754		fi
16755
16756		ac_fn_c_check_func "$LINENO" "ldns_key_buf2rsa_raw" "ac_cv_func_ldns_key_buf2rsa_raw"
	16740	else
	16741
	16742	as_fn_error $? "No ldns library found, install the ldns library into system lib dir or use --with-ldns=path to other location. The --with-ldns can point to the make-dir of ldns. Install the package ldns or download source http://www.nlnetlabs.nl/projects/ldns" "$LINENO" 5
	16743
	16744	fi
	16745
	16746	ac_fn_c_check_func "$LINENO" "ldns_buffer_copy" "ac_cv_func_ldns_buffer_copy"
	16747	if test "x$ac_cv_func_ldns_buffer_copy" = x""yes; then :
	16748
	16749	fi
	16750
	16751	ac_fn_c_check_func "$LINENO" "ldns_key_buf2rsa_raw" "ac_cv_func_ldns_key_buf2rsa_raw"
16757	16752	if test "x$ac_cv_func_ldns_key_buf2rsa_raw" = x""yes; then :
16758	16753
16759	16754	fi
16760	16755
16761		ac_fn_c_check_func "$LINENO" "ldns_get_random" "ac_cv_func_ldns_get_random"
	16756	ac_fn_c_check_func "$LINENO" "ldns_get_random" "ac_cv_func_ldns_get_random"
16762	16757	if test "x$ac_cv_func_ldns_get_random" = x""yes; then :
16763	16758
16764	16759	fi
16765	16760
16766		ac_fn_c_check_func "$LINENO" "ldns_b32_ntop_extended_hex" "ac_cv_func_ldns_b32_ntop_extended_hex"
	16761	ac_fn_c_check_func "$LINENO" "ldns_b32_ntop_extended_hex" "ac_cv_func_ldns_b32_ntop_extended_hex"
16767	16762	if test "x$ac_cv_func_ldns_b32_ntop_extended_hex" = x""yes; then :
16768	16763
16769	16764	fi
16770	16765
16771		if test x$use_gost = xyes; then
16772		ac_fn_c_check_func "$LINENO" "ldns_key_EVP_load_gost_id" "ac_cv_func_ldns_key_EVP_load_gost_id"
	16766	if test x$use_gost = xyes; then
	16767	ac_fn_c_check_func "$LINENO" "ldns_key_EVP_load_gost_id" "ac_cv_func_ldns_key_EVP_load_gost_id"
16773	16768	if test "x$ac_cv_func_ldns_key_EVP_load_gost_id" = x""yes; then :
16774	16769
16775	16770	fi
16776	16771
16777		for ac_func in ldns_key_EVP_unload_gost
	16772	for ac_func in ldns_key_EVP_unload_gost
16778	16773	do :
16779	16774	ac_fn_c_check_func "$LINENO" "ldns_key_EVP_unload_gost" "ac_cv_func_ldns_key_EVP_unload_gost"
16780	16775	if test "x$ac_cv_func_ldns_key_EVP_unload_gost" = x""yes; then :

16785	16780	fi
16786	16781	done
16787	16782
16788		else
16789		ac_cv_func_ldns_key_EVP_load_gost_id="yes"
16790		fi
16791		for ac_header in ldns/ldns.h
	16783	else
	16784	ac_cv_func_ldns_key_EVP_load_gost_id="yes"
	16785	fi
	16786	for ac_header in ldns/ldns.h
16792	16787	do :
16793	16788	ac_fn_c_check_header_compile "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default
16794	16789	#ifdef HAVE_SYS_SOCKET_H

16817	16812	#define HAVE_LDNS_LDNS_H 1
16818	16813	_ACEOF
16819	16814
	16815	else
	16816
	16817	as_fn_error $? "No ldns include file found, install the ldns library development files. Install package ldns-dev or ldns-devel or download source http://www.nlnetlabs.nl/projects/ldns" "$LINENO" 5
	16818
16820	16819	fi
16821	16820
16822	16821	done
16823	16822
16824		if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
16825		-a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
16826		-a $ac_cv_func_ldns_get_random = yes \
16827		-a $ac_cv_header_ldns_ldns_h = yes \
16828		-a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \
16829		-a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then
16830		:
16831		else
16832		as_fn_error $? "No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin" "$LINENO" 5
16833		fi
16834		fi
16835
16836		if test "$use_ldns_builtin" = "yes"; then
16837		if test ! -f $srcdir/ldns-src.tar.gz; then
16838		as_fn_error $? "No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." "$LINENO" 5
16839		fi
16840		echo "****************************************************************"
16841		echo "* *"
16842		echo "* Building ldns library from package included in this one. *"
16843		echo "* *"
16844		echo "****************************************************************"
16845		if test -d $srcdir/ldns-src; then rm -rf $srcdir/ldns-src; fi
16846		mkdir $srcdir/ldns-src; cp $srcdir/ldns-src.tar.gz $srcdir/ldns-src/ldns-src.tar.gz; (cd $srcdir/ldns-src; gzip -cd ldns-src.tar.gz \| tar xf -); rm -f $srcdir/ldns-src/ldns-src.tar.gz; mv $srcdir/ldns-src $srcdir/ldns-srcb; mv $srcdir/ldns-srcb/ldns* $srcdir/ldns-src; rmdir $srcdir/ldns-srcb
16847		ldnsdir="ldns-src"
16848		{ $as_echo "$as_me:${as_lineno-$LINENO}: Configure $ldnsdir scheduled after config.status" >&5
16849		$as_echo "$as_me: Configure $ldnsdir scheduled after config.status" >&6;}
16850
16851
16852		subdirs="$subdirs ldns-src"
16853
16854		CPPFLAGS="-I$ldnsdir/include $CPPFLAGS"
16855		LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
16856
16857		fi
	16823	if test $ac_cv_func_ldns_buffer_copy = yes \
	16824	-a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
	16825	-a $ac_cv_func_ldns_get_random = yes \
	16826	-a $ac_cv_header_ldns_ldns_h = yes \
	16827	-a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \
	16828	-a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then
	16829	:
	16830	else
	16831	as_fn_error $? "ldns library is not recent, update the ldns library, install it into system lib dir or use --with-ldns=path to other location. The --with-ldns can point to the make-dir of ldns. Package libldns or download source http://www.nlnetlabs.nl/projects/ldns" "$LINENO" 5
	16832	fi
	16833
16858	16834
16859	16835	{ $as_echo "$as_me:${as_lineno-$LINENO}: Stripping extension flags..." >&5
16860	16836	$as_echo "$as_me: Stripping extension flags..." >&6;}

17443	17419	# report actual input values of CONFIG_FILES etc. instead of their
17444	17420	# values after options handling.
17445	17421	ac_log="
17446		This file was extended by unbound $as_me 1.4.11, which was
	17422	This file was extended by unbound $as_me 1.4.12, which was
17447	17423	generated by GNU Autoconf 2.66. Invocation command line was
17448	17424
17449	17425	CONFIG_FILES = $CONFIG_FILES

17509	17485	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
17510	17486	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17511	17487	ac_cs_version="\\
17512		unbound config.status 1.4.11
	17488	unbound config.status 1.4.12
17513	17489	configured by $0, generated by GNU Autoconf 2.66,
17514	17490	with options \\"\$ac_cs_config\\"
17515	17491

19127	19103	# would make configure fail if this is the last instruction.
19128	19104	$ac_cs_success \|\| as_fn_exit 1
19129	19105	fi
19130
19131		#
19132		# CONFIG_SUBDIRS section.
19133		#
19134		if test "$no_recursion" != yes; then
19135
19136		# Remove --cache-file, --srcdir, and --disable-option-checking arguments
19137		# so they do not pile up.
19138		ac_sub_configure_args=
19139		ac_prev=
19140		eval "set x $ac_configure_args"
19141		shift
19142		for ac_arg
19143		do
19144		if test -n "$ac_prev"; then
19145		ac_prev=
19146		continue
19147		fi
19148		case $ac_arg in
19149		-cache-file \| --cache-file \| --cache-fil \| --cache-fi \
19150		\| --cache-f \| --cache- \| --cache \| --cach \| --cac \| --ca \| --c)
19151		ac_prev=cache_file ;;
19152		-cache-file=* \| --cache-file=* \| --cache-fil=* \| --cache-fi=* \
19153		\| --cache-f=* \| --cache-=* \| --cache=* \| --cach=* \| --cac=* \| --ca=* \
19154		\| --c=*)
19155		;;
19156		--config-cache \| -C)
19157		;;
19158		-srcdir \| --srcdir \| --srcdi \| --srcd \| --src \| --sr)
19159		ac_prev=srcdir ;;
19160		-srcdir=* \| --srcdir=* \| --srcdi=* \| --srcd=* \| --src=* \| --sr=*)
19161		;;
19162		-prefix \| --prefix \| --prefi \| --pref \| --pre \| --pr \| --p)
19163		ac_prev=prefix ;;
19164		-prefix=* \| --prefix=* \| --prefi=* \| --pref=* \| --pre=* \| --pr=* \| --p=*)
19165		;;
19166		--disable-option-checking)
19167		;;
19168		*)
19169		case $ac_arg in
19170		\') ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
19171		esac
19172		as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
19173		esac
19174		done
19175
19176		# Always prepend --prefix to ensure using the same prefix
19177		# in subdir configurations.
19178		ac_arg="--prefix=$prefix"
19179		case $ac_arg in
19180		\') ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
19181		esac
19182		ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
19183
19184		# Pass --silent
19185		if test "$silent" = yes; then
19186		ac_sub_configure_args="--silent $ac_sub_configure_args"
19187		fi
19188
19189		# Always prepend --disable-option-checking to silence warnings, since
19190		# different subdirs can have different --enable and --with options.
19191		ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
19192
19193		ac_popdir=`pwd`
19194		for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
19195
19196		# Do not complain, so a configure script can configure whichever
19197		# parts of a large source tree are present.
19198		test -d "$srcdir/$ac_dir" \|\| continue
19199
19200		ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
19201		$as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
19202		$as_echo "$ac_msg" >&6
19203		as_dir="$ac_dir"; as_fn_mkdir_p
19204		ac_builddir=.
19205
19206		case "$ac_dir" in
19207		.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
19208		*)
19209		ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'`
19210		# A ".." for each directory in $ac_dir_suffix.
19211		ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]*\|/..\|g;s\|/\|\|'`
19212		case $ac_top_builddir_sub in
19213		"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
19214		*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
19215		esac ;;
19216		esac
19217		ac_abs_top_builddir=$ac_pwd
19218		ac_abs_builddir=$ac_pwd$ac_dir_suffix
19219		# for backward compatibility:
19220		ac_top_builddir=$ac_top_build_prefix
19221
19222		case $srcdir in
19223		.) # We are building in place.
19224		ac_srcdir=.
19225		ac_top_srcdir=$ac_top_builddir_sub
19226		ac_abs_top_srcdir=$ac_pwd ;;
19227		[\\/]* \| ?:[\\/]* ) # Absolute name.
19228		ac_srcdir=$srcdir$ac_dir_suffix;
19229		ac_top_srcdir=$srcdir
19230		ac_abs_top_srcdir=$srcdir ;;
19231		*) # Relative name.
19232		ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
19233		ac_top_srcdir=$ac_top_build_prefix$srcdir
19234		ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
19235		esac
19236		ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
19237
19238
19239		cd "$ac_dir"
19240
19241		# Check for guested configure; otherwise get Cygnus style configure.
19242		if test -f "$ac_srcdir/configure.gnu"; then
19243		ac_sub_configure=$ac_srcdir/configure.gnu
19244		elif test -f "$ac_srcdir/configure"; then
19245		ac_sub_configure=$ac_srcdir/configure
19246		elif test -f "$ac_srcdir/configure.in"; then
19247		# This should be Cygnus configure.
19248		ac_sub_configure=$ac_aux_dir/configure
19249		else
19250		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
19251		$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
19252		ac_sub_configure=
19253		fi
19254
19255		# The recursion is here.
19256		if test -n "$ac_sub_configure"; then
19257		# Make the cache file name correct relative to the subdirectory.
19258		case $cache_file in
19259		[\\/]* \| ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
19260		*) # Relative name.
19261		ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
19262		esac
19263
19264		{ $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
19265		$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
19266		# The eval makes quoting arguments work.
19267		eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
19268		--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" \|\|
19269		as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
19270		fi
19271
19272		cd "$ac_popdir"
19273		done
19274		fi
19275	19106	if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
19276	19107	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
19277	19108	$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

+32

-54

configure.ac less more

5	5	sinclude(acx_python.m4)
6	6	sinclude(ac_pkg_swig.m4)
7	7
8		AC_INIT(unbound, 1.4.11, unbound-bugs@nlnetlabs.nl, unbound)
	8	AC_INIT(unbound, 1.4.12, unbound-bugs@nlnetlabs.nl, unbound)
9	9
10	10	LIBUNBOUND_CURRENT=2
11		LIBUNBOUND_REVISION=11
	11	LIBUNBOUND_REVISION=12
12	12	LIBUNBOUND_AGE=0
13	13	# 1.0.0 had 0:12:0
14	14	# 1.0.1 had 0:13:0

35	35	# 1.4.9 had 2:9:0
36	36	# 1.4.10 had 2:10:0
37	37	# 1.4.11 had 2:11:0
	38	# 1.4.12 had 2:12:0
38	39
39	40	# Current -- the number of the binary API that we're implementing
40	41	# Revision -- which iteration of the implementation of the binary

583	584	# set static linking if requested
584	585	AC_SUBST(staticexe)
585	586	staticexe=""
586		AC_ARG_ENABLE(staticexe, AC_HELP_STRING([--enable-static-exe],
	587	AC_ARG_ENABLE(static-exe, AC_HELP_STRING([--enable-static-exe],
587	588	[ enable to compile executables statically against event, ldns libs, for debug purposes ]),
588	589	, )
589	590	if test x_$enable_static_exe = x_yes; then

709	710
710	711	# check this after all other compilation checks, since the linking of the lib
711	712	# may break checks after this.
712		use_ldns_builtin="no"
713	713	AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH],
714	714	[specify prefix of path of ldns library to use]),
715		[ specialldnsdir="$withval"
	715	[
716	716	if test "$withval" != "yes"; then
717	717	if test "$withval" != "/usr" -a "$withval" != ""; then
718	718	CPPFLAGS="-I$withval/include $CPPFLAGS"

724	724	fi
725	725	])
726	726
727		AC_ARG_WITH(ldns-builtin, AC_HELP_STRING([--with-ldns-builtin],
728		[forces use of package included with this one]), [
729		use_ldns_builtin="yes"
	727	# check if ldns is good enough
	728	AC_CHECK_LIB(ldns, ldns_rr_new,,[
	729	AC_MSG_ERROR([No ldns library found, install the ldns library into system lib dir or use --with-ldns=path to other location. The --with-ldns can point to the make-dir of ldns. Install the package ldns or download source http://www.nlnetlabs.nl/projects/ldns])
730	730	])
731
732		# check if ldns is good enough
733		if test "$use_ldns_builtin" = "no"; then
734		AC_CHECK_LIB(ldns, ldns_buffer_copy)
735		AC_CHECK_FUNC(ldns_key_buf2rsa_raw)
736		AC_CHECK_FUNC(ldns_get_random)
737		AC_CHECK_FUNC(ldns_b32_ntop_extended_hex)
738		if test x$use_gost = xyes; then
739		AC_CHECK_FUNC(ldns_key_EVP_load_gost_id)
740		AC_CHECK_FUNCS([ldns_key_EVP_unload_gost])
741		else
742		ac_cv_func_ldns_key_EVP_load_gost_id="yes"
743		fi
744		AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT
	731	AC_CHECK_FUNC(ldns_buffer_copy)
	732	AC_CHECK_FUNC(ldns_key_buf2rsa_raw)
	733	AC_CHECK_FUNC(ldns_get_random)
	734	AC_CHECK_FUNC(ldns_b32_ntop_extended_hex)
	735	if test x$use_gost = xyes; then
	736	AC_CHECK_FUNC(ldns_key_EVP_load_gost_id)
	737	AC_CHECK_FUNCS([ldns_key_EVP_unload_gost])
	738	else
	739	ac_cv_func_ldns_key_EVP_load_gost_id="yes"
	740	fi
	741	AC_CHECK_HEADERS([ldns/ldns.h],,[
	742	AC_MSG_ERROR([No ldns include file found, install the ldns library development files. Install package ldns-dev or ldns-devel or download source http://www.nlnetlabs.nl/projects/ldns])
	743	], [AC_INCLUDES_DEFAULT
745	744	#ifdef HAVE_SYS_SOCKET_H
746	745	#include <sys/socket.h>
747	746	#endif

762	761	#include <ws2tcpip.h>
763	762	#endif
764	763	])
765		if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \
766		-a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
767		-a $ac_cv_func_ldns_get_random = yes \
768		-a $ac_cv_header_ldns_ldns_h = yes \
769		-a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \
770		-a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then
771		dnl ldns was found
772		:
773		else
774		AC_MSG_ERROR([No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin])
775		fi
776		fi
777
778		if test "$use_ldns_builtin" = "yes"; then
779		dnl use the builtin ldns-src.tar.gz file to build ldns.
780		if test ! -f $srcdir/ldns-src.tar.gz; then
781		AC_MSG_ERROR([No ldns library found and no ldns-src.tar.gz, use --with-ldns=path.])
782		fi
783		echo "****************************************************************"
784		echo "* *"
785		echo "* Building ldns library from package included in this one. *"
786		echo "* *"
787		echo "****************************************************************"
788		if test -d $srcdir/ldns-src; then rm -rf $srcdir/ldns-src; fi
789		mkdir $srcdir/ldns-src; cp $srcdir/ldns-src.tar.gz $srcdir/ldns-src/ldns-src.tar.gz; (cd $srcdir/ldns-src; gzip -cd ldns-src.tar.gz \| tar xf -); rm -f $srcdir/ldns-src/ldns-src.tar.gz; mv $srcdir/ldns-src $srcdir/ldns-srcb; mv $srcdir/ldns-srcb/ldns* $srcdir/ldns-src; rmdir $srcdir/ldns-srcb
790		ldnsdir="ldns-src"
791		AC_MSG_NOTICE([Configure $ldnsdir scheduled after config.status])
792		AC_CONFIG_SUBDIRS([ldns-src])
793		CPPFLAGS="-I$ldnsdir/include $CPPFLAGS"
794		LDFLAGS="$LDFLAGS $ldnsdir/*.lo"
795		AC_SUBST(ldnsdir)
796		fi dnl end of use_ldns_builtin == yes
	764	if test $ac_cv_func_ldns_buffer_copy = yes \
	765	-a $ac_cv_func_ldns_key_buf2rsa_raw = yes \
	766	-a $ac_cv_func_ldns_get_random = yes \
	767	-a $ac_cv_header_ldns_ldns_h = yes \
	768	-a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \
	769	-a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then
	770	dnl ldns was found
	771	:
	772	else
	773	AC_MSG_ERROR([ldns library is not recent, update the ldns library, install it into system lib dir or use --with-ldns=path to other location. The --with-ldns can point to the make-dir of ldns. Package libldns or download source http://www.nlnetlabs.nl/projects/ldns])
	774	fi
797	775
798	776	ACX_STRIP_EXT_FLAGS
799	777	LDFLAGS="$LATE_LDFLAGS $LDFLAGS"

-1

daemon/remote.c less more

394	394	/* create new commpoint unless we are servicing already */
395	395	if(rc->active >= rc->max_active) {
396	396	log_warn("drop incoming remote control: too many connections");
397		comm_point_stop_listening(c);
398	397	close_exit:
399	398	#ifndef USE_WINSOCK
400	399	close(newfd);

-5

daemon/worker.c less more

738	738	worker->stats.unwanted_queries++;
739	739	return 0;
740	740	} else if(acl == acl_refuse) {
	741	log_addr(VERB_ALGO, "refused query from",
	742	&repinfo->addr, repinfo->addrlen);
	743	log_buf(VERB_ALGO, "refuse", c->buffer);
	744	if(worker->stats.extended)
	745	worker->stats.unwanted_queries++;
	746	if(worker_check_request(c->buffer, worker) == -1) {
	747	comm_point_drop_reply(repinfo);
	748	return 0; /* discard this */
	749	}
741	750	ldns_buffer_set_limit(c->buffer, LDNS_HEADER_SIZE);
742	751	ldns_buffer_write_at(c->buffer, 4,
743	752	(uint8_t*)"\0\0\0\0\0\0\0\0", 8);
744	753	LDNS_QR_SET(ldns_buffer_begin(c->buffer));
745	754	LDNS_RCODE_SET(ldns_buffer_begin(c->buffer),
746	755	LDNS_RCODE_REFUSED);
747		log_addr(VERB_ALGO, "refused query from",
748		&repinfo->addr, repinfo->addrlen);
749		log_buf(VERB_ALGO, "refuse", c->buffer);
750		if(worker->stats.extended)
751		worker->stats.unwanted_queries++;
752	756	return 1;
753	757	}
754	758	if((ret=worker_check_request(c->buffer, worker)) != 0) {

+15

-0

doc/Changelog less more

	0	1 July 2011: Wouter
	1	- version number in example config file.
	2	- fix that --enable-static-exe does not complain about it unknown.
	3
	4	30 June 2011: Wouter
	5	- tag relase 1.4.11, trunk is 1.4.12 development.
	6	- iana portlist updated.
	7	- fix bug#395: id bits of other query may leak out under conditions
	8	- fix replyaddr count wrong after jostled queries, which leads to
	9	eventual starvation where the daemon has no replyaddrs left to use.
	10	- fix comment about rndc port, that referred to the old port number.
	11	- fix that the listening socket is not closed when too many remote
	12	control connections are made at the same time.
	13	- removed ldns-src tarball inside the unbound tarball.
	14
0	15	23 June 2011: Wouter
1	16	- Changed -flto check to support clang compiler.
2	17	- tag 1.4.11rc3 created.

-5

doc/README less more

0		README for Unbound 1.4.11
	0	README for Unbound 1.4.12
1	1	Copyright 2007 NLnet Labs
2	2	http://unbound.net
3	3

10	10
11	11	* Uses the following libraries;
12	12	* ldns http://www.nlnetlabs.nl/ldns/ (BSD license)
13		(required) can use tarball from source directory.
	13	(required) can use ldns build directory directly with --with-ldns=path.
14	14	* libevent http://www.monkey.org/~provos/libevent/ (BSD license)
15	15	(optional) can use builtin alternative instead.
16	16
17	17	* Make and install: ./configure; make; make install
18	18	* Use GNU make; default on linux, often called 'gmake' on BSD and Solaris.
19	19	* --with-ldns=/path/to/ldns
20		If ldns is not detected on the system, a prepackaged tarball
21		of the ldns library is used to compile and statically link against.
22		If detected on the system, it will dynamically link against it.
	20	It will dynamically link against it.
23	21	* --with-libevent=/path/to/libevent
24	22	Can be set to either the system install or the build directory.
25	23	--with-libevent=no (default) gives a builtin alternative

-1

doc/example.conf.in less more

0	0	#
1	1	# Example configuration file.
2	2	#
3		# See unbound.conf(5) man page.
	3	# See unbound.conf(5) man page, version 1.4.12.
4	4	#
5	5	# this is a comment.
6	6

-2

doc/libunbound.3.in less more

0		.TH "libunbound" "3" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "libunbound" "3" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" libunbound.3 -- unbound library functions manual
3	3	.\"

41	41	.B ub_ctx_zone_remove,
42	42	.B ub_ctx_data_add,
43	43	.B ub_ctx_data_remove
44		\- Unbound DNS validating resolver 1.4.11 functions.
	44	\- Unbound DNS validating resolver 1.4.12 functions.
45	45	.SH "SYNOPSIS"
46	46	.LP
47	47	.B #include <unbound.h>

-1

doc/unbound-anchor.8.in less more

0		.TH "unbound-anchor" "8" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound-anchor" "8" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound-anchor.8 -- unbound anchor maintenance utility manual
3	3	.\"

-1

doc/unbound-checkconf.8.in less more

0		.TH "unbound-checkconf" "8" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound-checkconf" "8" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound-checkconf.8 -- unbound configuration checker manual
3	3	.\"

-1

doc/unbound-control.8.in less more

0		.TH "unbound-control" "8" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound-control" "8" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound-control.8 -- unbound remote control manual
3	3	.\"

-1

doc/unbound-host.1 less more

0		.TH "unbound\-host" "1" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound\-host" "1" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound-host.1 -- unbound DNS lookup utility
3	3	.\"

-2

doc/unbound.8.in less more

0		.TH "unbound" "8" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound" "8" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound.8 -- unbound manual
3	3	.\"

9	9	.SH "NAME"
10	10	.LP
11	11	.B unbound
12		\- Unbound DNS validating resolver 1.4.11.
	12	\- Unbound DNS validating resolver 1.4.12.
13	13	.SH "SYNOPSIS"
14	14	.LP
15	15	.B unbound

-5

doc/unbound.conf.5.in less more

0		.TH "unbound.conf" "5" "Jun 30, 2011" "NLnet Labs" "unbound 1.4.11"
	0	.TH "unbound.conf" "5" "Jul 14, 2011" "NLnet Labs" "unbound 1.4.12"
1	1	.\"
2	2	.\" unbound.conf.5 -- unbound.conf manual
3	3	.\"

893	893	Use 0.0.0.0 and ::0 to listen to all interfaces.
894	894	.TP 5
895	895	.B control\-port: <port number>
896		The port number to listen on for control commands, default is 8953
897		(that is the same port number named uses to listen to rndc).
898		If you change this port number, and permissions have been dropped, a
899		reload is not sufficient to open the port again, you must then restart.
	896	The port number to listen on for control commands, default is 8953.
	897	If you change this port number, and permissions have been dropped,
	898	a reload is not sufficient to open the port again, you must then restart.
900	899	.TP 5
901	900	.B server\-key\-file: "<private key file>"
902	901	Path to the server private key, by default unbound_server.key.

~~ldns-src.tar.gz~~ less more

Binary diff not shown

-0

ltmain.sh less more

(No changes)

-1

services/mesh.c less more

527	527	int i;
528	528	if(!mstate)
529	529	return;
	530	mesh = mstate->s.env->mesh;
530	531	/* drop unsent replies */
531	532	if(!mstate->replies_sent) {
532	533	struct mesh_reply* rep;
533	534	struct mesh_cb* cb;
534	535	for(rep=mstate->reply_list; rep; rep=rep->next) {
535	536	comm_point_drop_reply(&rep->query_reply);
	537	mesh->num_reply_addrs--;
536	538	}
537	539	for(cb=mstate->cb_list; cb; cb=cb->next) {
538	540	fptr_ok(fptr_whitelist_mesh_cb(cb->cb));
539	541	(*cb->cb)(cb->cb_arg, LDNS_RCODE_SERVFAIL, NULL,
540	542	sec_status_unchecked, NULL);
	543	mesh->num_reply_addrs--;
541	544	}
542	545	}
543	546
544	547	/* de-init modules */
545		mesh = mstate->s.env->mesh;
546	548	for(i=0; i<mesh->mods.num; i++) {
547	549	fptr_ok(fptr_whitelist_mod_clear(mesh->mods.mod[i]->clear));
548	550	(*mesh->mods.mod[i]->clear)(&mstate->s, i);

-1

smallapp/unbound-control-setup.sh less more

80	80	echo " -d dir use directory to store keys and certificates."
81	81	echo " default: $DESTDIR"
82	82	echo "please run this command using the same user id that the "
83		echo "unboun daemon uses, it needs read privileges."
	83	echo "unbound daemon uses, it needs read privileges."
84	84	exit 1
85	85	;;
86	86	esac

-1

util/iana_ports.inc less more

1907	1907	2256,
1908	1908	2257,
1909	1909	2258,
1910		2259,
1911	1910	2260,
1912	1911	2261,
1913	1912	2262,

4374	4373	6147,
4375	4374	6148,
4376	4375	6149,
	4376	6160,
4377	4377	6161,
4378	4378	6162,
4379	4379	6163,

4776	4776	8770,
4777	4777	8786,
4778	4778	8787,
	4779	8793,
4779	4780	8800,
4780	4781	8804,
4781	4782	8873,