src/: Change how query domain names are checked.

[adns.git] / client / adnstest.c

diff --git a/client/adnstest.c b/client/adnstest.c
index f7931074d9fa3092dbdb332fa9b0345e2407abe7..550cf275642f7f29683a9c278bf90e22b49bb274 100644 (file)
--- a/client/adnstest.c
+++ b/client/adnstest.c
@@ -3,12 +3,11 @@
  * - simple test program, not part of the library
  */
 /*
- *  This file is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- *  It is part of adns, which is
- *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -122,13 +121,11 @@ static const adns_rrtype defaulttypes[]= {
   adns_r_mx_raw,
   adns_r_txt,
   adns_r_rp_raw,
-  adns_r_srv_raw,
   
   adns_r_addr,
   adns_r_ns,
   adns_r_ptr,
   adns_r_mx,
-  adns_r_srv,
   
   adns_r_soa,
   adns_r_rp,
@@ -138,7 +135,7 @@ static const adns_rrtype defaulttypes[]= {
 
 static void dumptype(adns_status ri, const char *rrtn, const char *fmtn) {
   fprintf(stdout, "%s(%s)%s%s",
-         ri ? "?" : rrtn, ri ? "?" : fmtn ? fmtn : "-",
+         (!ri && rrtn) ? rrtn : "?", ri ? "?" : fmtn ? fmtn : "-",
          ri ? " " : "", ri ? adns_strerror(ri) : "");
 }