Licensing: Update copyright dates for Ian Jackson

[adns] / src / reply.c

diff --git a/src/reply.c b/src/reply.c
index 62384ab9571d70c3b7d25e850e3ae5836a974ad9..83c343110ad54f76c34ee97330dc8222ca6ef338 100644 (file)
--- a/src/reply.c
+++ b/src/reply.c
@@ -4,14 +4,14 @@
  */
 /*
  *  This file is part of adns, which is
  */
 /*
  *  This file is part of adns, which is

- *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1997-2000,2003,2006,2014  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
  *    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

- *  the Free Software Foundation; either version 2, or (at your option)
+ *  the Free Software Foundation; either version 3, or (at your option)

  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,
  *  any later version.
  *  
  *  This program is distributed in the hope that it will be useful,


@@ -20,8 +20,7 @@
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License
  *  GNU General Public License for more details.
  *  
  *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software Foundation,
- *  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+ *  along with this program; if not, write to the Free Software Foundation.

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>


@@ -311,7 +310,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
 
   /* Now, we have some RRs which we wanted. */
 
 
   /* Now, we have some RRs which we wanted. */
 

-  qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->typei->rrsz*wantedrrs);
+  qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->answer->rrsz*wantedrrs);

   if (!qu->answer->rrs.untyped) {
     adns__query_fail(qu,adns_s_nomemory);
     return;
   if (!qu->answer->rrs.untyped) {
     adns__query_fail(qu,adns_s_nomemory);
     return;


@@ -341,7 +340,8 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen,
        !ownermatched)
       continue;
     adns__update_expires(qu,ttl,now);
        !ownermatched)
       continue;
     adns__update_expires(qu,ttl,now);

-    st= typei->parse(&pai, rdstart,rdstart+rdlength, rrsdata+nrrs*typei->rrsz);
+    st= typei->parse(&pai, rdstart,rdstart+rdlength,
+                    rrsdata+nrrs*qu->answer->rrsz);

     if (st) { adns__query_fail(qu,st); return; }
     if (rdstart==-1) goto x_truncated;
     nrrs++;
     if (st) { adns__query_fail(qu,st); return; }
     if (rdstart==-1) goto x_truncated;
     nrrs++;