From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Fri, 4 Mar 2005 10:47:42 +0000 (+0000)
Subject: better snapshot target
X-Git-Tag: release-0.50~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=001b35f9f19522dd0657b83c47e52fd846586bd2;p=thirdparty%2Fldns.git

better snapshot target
& -> && in pkt_type
---

diff --git a/Makefile.in b/Makefile.in
index 0d3a0c55..52b964d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,7 @@
 # See the file LICENSE for the license
 SHELL 		= @SHELL@
 srcdir 		= @srcdir@
+basesrcdir	= $(shell basename `pwd`)
 prefix  	= @prefix@
 exec_prefix 	= @exec_prefix@
 bindir 		= @bindir@
@@ -75,8 +76,9 @@ libldns.a:	$(LIBDNS_OBJECTS) b64_pton$U.o b64_ntop$U.o
 		ranlib libldns.a
 
 snapshot:	clean testclean
+		echo $(basesrcdir)
 		(rm -rf ../ldns-snap-$(DATE)/)
-		(cd .. ; cp -r libdns/ ldns-snap-$(DATE)/)
+		(cd .. ; cp -r $(basesrcdir)/ ldns-snap-$(DATE)/)
 		(cd .. ; tar --verbose  --exclude ".svn" --create --file ldns-snap-$(DATE).tar.gz --gzip ldns-snap-$(DATE)/)
 		(rm -rf ../ldns-snap-$(DATE)/)
 
diff --git a/packet.c b/packet.c
index 1c1120ed..bb6af995 100644
--- a/packet.c
+++ b/packet.c
@@ -715,7 +715,7 @@ ldns_pkt_reply_type(ldns_pkt *p)
 		}
 	}
 
-	if (ldns_pkt_ancount(p) == 0 & ldns_pkt_nscount(p) > 0) {
+	if (ldns_pkt_ancount(p) == 0 && ldns_pkt_nscount(p) > 0) {
 		if (ldns_pkt_rr_list_by_type(p, LDNS_RR_TYPE_NS,
 					LDNS_SECTION_AUTHORITY)) {
 			/* there are nameservers here */