Regression tests pass with new owner and flags stuff, not yet tested

search.

diff --git a/client/adnstest.c b/client/adnstest.c
index 9828ee0..4f2b982 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -135,7 +135,7 @@ int main(int argc, char *const *argv) {
   for (qi=0; qi<qc; qi++) {
     fdom_split(fdomlist[qi],&domain,&qflags);
     for (ti=0; ti<tc; ti++) {
-      fprintf(stdout,"%s type %d flags %d",domain,types[ti],qflags);
+      fprintf(stdout,"%s flags %d type %d",domain,qflags,types[ti]);
       r= adns_submit(ads,domain,types[ti],qflags,0,&qus[qi*tc+ti]);
       if (r == adns_s_unknownrrtype) {
        fprintf(stdout," not implemented\n");
@@ -164,10 +164,10 @@ int main(int argc, char *const *argv) {
       if (gettimeofday(&now,0)) { perror("gettimeofday"); exit(3); }
       
       ri= adns_rr_info(ans->type, &rrtn,&fmtn,&len, 0,0);
-      fprintf(stdout, "%s type ",domain);
+      fprintf(stdout, "%s flags %d type ",domain,qflags);
       dumptype(ri,rrtn,fmtn);
-      fprintf(stdout, " flags %d: %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
-             qflags, adns_strerror(ans->status),
+      fprintf(stdout, ": %s; nrrs=%d; cname=%s; owner=%s; ttl=%ld\n",
+             adns_strerror(ans->status),
              ans->nrrs,
              ans->cname ? ans->cname : "$",
              ans->owner ? ans->owner : "$",

diff --git a/regress/case-mailboxes.out b/regress/case-mailboxes.out
index ad5e633..8b3e103 100644 (file)
--- a/regress/case-mailboxes.out
+++ b/regress/case-mailboxes.out
@@ -1,6 +1,6 @@
 adns debug: using nameserver 172.18.45.6
-silly-rp.test.iwj.relativity.greenend.org.uk type 131089 RP(822) submitted
-silly-rp.test.iwj.relativity.greenend.org.uk type RP(822): OK; nrrs=6; cname=$; ttl=60
+silly-rp.test.iwj.relativity.greenend.org.uk flags 0 type 131089 RP(822) submitted
+silly-rp.test.iwj.relativity.greenend.org.uk flags 0 type RP(822): OK; nrrs=6; cname=$; owner=$; ttl=60
  "<>" ""
  "i@ucam.org" ""
  "i.j@ucam.org" ""

diff --git a/regress/case-manya.out b/regress/case-manya.out
index 6a352a0..5134751 100644 (file)
--- a/regress/case-manya.out
+++ b/regress/case-manya.out
@@ -1,6 +1,6 @@
 adns debug: using nameserver 172.18.45.6
-manyaddrs.test.iwj.relativity.greenend.org.uk type 1 A(-) submitted
-manyaddrs.test.iwj.relativity.greenend.org.uk type A(-): OK; nrrs=4; cname=$; ttl=60
+manyaddrs.test.iwj.relativity.greenend.org.uk flags 0 type 1 A(-) submitted
+manyaddrs.test.iwj.relativity.greenend.org.uk flags 0 type A(-): OK; nrrs=4; cname=$; owner=$; ttl=60
  127.0.0.1
  172.18.45.6
  172.18.45.1

diff --git a/regress/case-norm.out b/regress/case-norm.out
index 9be2769..67db3df 100644 (file)
--- a/regress/case-norm.out
+++ b/regress/case-norm.out
@@ -1,4 +1,4 @@
 adns debug: using nameserver 172.18.45.6
-chiark.greenend.org.uk type 1 A(-) submitted
-chiark.greenend.org.uk type A(-): OK; nrrs=1; cname=$; ttl=86400
+chiark.greenend.org.uk flags 0 type 1 A(-) submitted
+chiark.greenend.org.uk flags 0 type A(-): OK; nrrs=1; cname=$; owner=$; ttl=86400
  195.224.76.132

diff --git a/regress/case-timeout.out b/regress/case-timeout.out
index ccbbd39..f07f9bc 100644 (file)
--- a/regress/case-timeout.out
+++ b/regress/case-timeout.out
@@ -1,3 +1,3 @@
 adns debug: using nameserver 172.18.45.36
-chiark.greenend.org.uk type 1 A(-) submitted
-chiark.greenend.org.uk type A(-): DNS query timed out; nrrs=0; cname=$; ttl=604770
+chiark.greenend.org.uk flags 0 type 1 A(-) submitted
+chiark.greenend.org.uk flags 0 type A(-): DNS query timed out; nrrs=0; cname=$; owner=$; ttl=604770

diff --git a/regress/case-trunc.out b/regress/case-trunc.out
index 7943119..5882fcd 100644 (file)
--- a/regress/case-trunc.out
+++ b/regress/case-trunc.out
@@ -1,3 +1,3 @@
 adns debug: using nameserver 172.18.45.6
-trunc.test.iwj.relativity.greenend.org.uk type 1 A(-) submitted
-trunc.test.iwj.relativity.greenend.org.uk type A(-): No such data; nrrs=0; cname=$; ttl=60
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type 1 A(-) submitted
+trunc.test.iwj.relativity.greenend.org.uk flags 0 type A(-): No such data; nrrs=0; cname=$; owner=$; ttl=60