better snapshot target

& -> && in pkt_type

diff --git a/Makefile.in b/Makefile.in
index 0d3a0c55d9a1cf43fc273067eaa7f4f68f55ee89..52b964d2a29acbdebe133d04f9c15e8f88286839 100644 (file)
--- 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 1c1120edfcd832f025a16a0c6e6dbfce7a02d12c..bb6af995d5a24e883da70120a407757a7265335b 100644 (file)
--- 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 */