]> granicus.if.org Git - pdns/commitdiff
silence a warning from the BIND backend, plus vamp up the auto-build script for rapid...
authorBert Hubert <bert.hubert@netherlabs.nl>
Tue, 11 Jan 2011 09:25:48 +0000 (09:25 +0000)
committerBert Hubert <bert.hubert@netherlabs.nl>
Tue, 11 Jan 2011 09:25:48 +0000 (09:25 +0000)
git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1863 d19b8d6e-7fed-0310-83ef-9ca221ded41b

build-scripts/auto-build
pdns/backends/bind/bindbackend2.cc

index 1aac1c04f2b26a5ffe1ca1cb8937aaabdbab4401..f71929a713a8c2cb80863bb21e404a1b46fef438 100755 (executable)
@@ -1,17 +1,14 @@
-#!/bin/sh 
+#!/bin/bash 
 
 # Internal script used to build daily snapshots (if there is a change in svn, that is)
 
-export PATH=/opt/gcc-4.0.2/bin:$PATH
-export LD_LIBRARY_PATH=/opt/gcc-4.0.2/lib
-
 cd /home/ahu/auto-build
 if [ -e pdns ] 
 then
        cd pdns
        LATEST=$(svn info svn://svn.powerdns.com/pdns/ | awk  '/^Revision/ { print $2 }'  )
        CO=$(svn info . | awk  '/^Revision/ { print $2 }'  )
-       if [ "$LATEST" -eq "$CO" -a -e ../pdns*$CO-1.i386.rpm ]
+       if [ "$LATEST" -eq "$CO" -a -e ../pdns-static*$CO-1.i386.rpm ]
        then
                echo nothing to do
                exit
@@ -25,18 +22,22 @@ svn co svn://svn.powerdns.com/pdns/trunk/pdns
 cd pdns
 LATEST=$(svn info . | awk  '/^Revision/ { print $2 }'  )
 DATE=$(date +%Y%m%d).$LATEST
+
 ssed -r "s/Version: (.*)/Version: \\1.$DATE/" -i *.spec
-ssed -r "s/AM_INIT_AUTOMAKE\\(pdns, (.*)\\)/AM_INIT_AUTOMAKE\(pdns, \\1.$DATE\)/" -i configure.in
-ssed -r "s/^pdns \\(([^-]*)-[0-9]*\\)/pdns \\(\\1.$DATE-1\\)/" -i debian-pdns/changelog
+ssed -r "s/AM_INIT_AUTOMAKE\\(pdns, (.*)\\)/AM_INIT_AUTOMAKE\(pdns, \\1.$DATE\)/" -i configure.ac
+ssed -r "s/^pdns \\(([^-]*(-rc[0-9])*)-[0-9]*\\)/pdns \\(\\1.$DATE-1\\)/" -i debian-pdns/changelog
 
 ./bootstrap
 fakeroot debian-pdns/rules binary-static
 rm -rf debian-pdns/tmp/
-fakeroot ./build-scripts/rpm-build-instruction
+./build-scripts/rpm-build-instruction
+rm debian-pdns/.svn -rf
 build-scripts/tar-gz-build-instruction
 cd ..
 mv pdns/*.tar.gz .
-ssh adsl-xs4all.ds9a.nl mkdir /var/www/svn.powerdns.com/snapshots/$LATEST
-scp pdns*$LATEST*{rpm,deb,tar.gz} adsl-xs4all.ds9a.nl:/var/www/svn.powerdns.com/snapshots/$LATEST
+#ssh svn.powerdns.com mkdir /var/www/svn.powerdns.com/snapshots/$LATEST
+echo rsync -v --bwlimit=75 pdns-static*$LATEST*{rpm,deb,tar.gz} svn.powerdns.com:/var/www/svn.powerdns.com/dnssec-wild-testing > boe
+bash ./boe
+
 
 
index 0709e130c765a2c629ae5c4ee603571e5603f145..53b23c0d00ee40d3eaf851c74a38c74b6dd229dd 100644 (file)
@@ -1049,7 +1049,7 @@ bool Bind2Backend::handle::get_normal(DNSResourceRecord &r)
   r.ttl=(d_iter)->ttl;
   r.priority=(d_iter)->priority;
 
-  if(!d_iter->auth)
+  if(!d_iter->auth && r.qtype != QType::A && r.qtype!=QType::AAAA && r.qtype != QType::NS)
     cerr<<"Warning! Unauth response!"<<endl;
   r.auth = d_iter->auth;