Hacking to make out-of-tree builds work properly.

[adns.git] / src / transmit.c

diff --git a/src/transmit.c b/src/transmit.c
index 6136bf9b6e981b85b9088d279a866cec9fe4cde1..7afb90f2bd6777dceb6bcce1642fa94be60079dd 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -4,12 +4,11 @@
  * - send queries
  */
 /*
- *  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
@@ -67,7 +66,7 @@ static adns_status mkquery_footer(vbuf *vb, adns_rrtype type) {
   byte *rqp;
 
   MKQUERY_START(vb);
-  MKQUERY_ADDW(type & adns__rrt_typemask); /* QTYPE */
+  MKQUERY_ADDW(type & adns_rrt_typemask); /* QTYPE */
   MKQUERY_ADDW(DNS_CLASS_IN); /* QCLASS=IN */
   MKQUERY_STOP(vb);
   assert(vb->used <= vb->avail);
@@ -121,7 +120,8 @@ adns_status adns__qdpl_normal(adns_state ads,
 
 adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
                          const char *owner, int ol,
-                         const typeinfo *typei, adns_queryflags flags) {
+                         const typeinfo *typei, adns_rrtype type,
+                         adns_queryflags flags) {
   int labelnum, ll, nbytes;
   byte label[255];
   byte *rqp;
@@ -150,7 +150,7 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
 
   MKQUERY_STOP(vb);
   
-  st= mkquery_footer(vb,typei->type);
+  st= mkquery_footer(vb,type);
   
   return adns_s_ok;
 }