From 22bd0404f255d4013ad2dae1438906d5e90cfc14 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 2 Jan 2021 23:58:03 +0000
Subject:  Prepare for 2.3.4.0

---
 INSTALL                                     |  2 +-
 NEWS                                        |  6 ++++++
 doc/index.html                              |  4 ++--
 doc/upgrade.html                            |  7 +++++++
 package/info                                |  2 +-
 src/libs6dns/s6dns_message_parse_question.c | 10 +++++++---
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index c8bdd2f..d3521d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.9.3.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.10.0.0 or later: http://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/NEWS b/NEWS
index ac69396..906d2ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-dns.
 
+In 2.3.4.0
+----------
+
+ - New function: s6dns_message_parse_question().
+
+
 In 2.3.3.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 9fdc636..7af0349 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -46,7 +46,7 @@ point in the future.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.9.3.0 or later. It's a build-time requirement. It's also a run-time
+2.10.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs library. </li>
 </ul>
 
@@ -60,7 +60,7 @@ requirement if you link against the shared version of the skalibs library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6-dns is <a href="s6-dns-2.3.3.0.tar.gz">2.3.3.0</a>. </li>
+ <li> The current released version of s6-dns is <a href="s6-dns-2.3.4.0.tar.gz">2.3.4.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-dns/">s6-dns
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 94255c8..5b7b9bb 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-dns </h1>
 
+<h2> in 2.3.4.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.10.0.0. </li>
+</ul>
+
 <h2> in 2.3.3.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 432358a..cc9acb8 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-dns
-version=2.3.3.0
+version=2.3.4.0
 category=web
 package_macro_name=S6_DNS
diff --git a/src/libs6dns/s6dns_message_parse_question.c b/src/libs6dns/s6dns_message_parse_question.c
index 170168c..780ec22 100644
--- a/src/libs6dns/s6dns_message_parse_question.c
+++ b/src/libs6dns/s6dns_message_parse_question.c
@@ -8,15 +8,19 @@
 #include <s6-dns/s6dns-constants.h>
 #include <s6-dns/s6dns-message.h>
 
-int s6dns_message_parse_question (s6dns_message_counts_t *counts, s6dns_domain_t *name, uint16_t *qtype, char const *packet, unsigned int packetlen, unsigned int *pos)
+int s6dns_message_parse_question (s6dns_message_counts_t *counts, s6dns_domain_t *name, uint16_t *qtypep, char const *packet, unsigned int packetlen, unsigned int *pos)
 {
+  s6dns_domain_t d ;
+  uint16_t qtype ;
   uint16_t qclass ;
   if (!counts->qd) return (errno = EINVAL, 0) ;
-  if (!s6dns_message_get_domain(name, packet, packetlen, pos)) return 0 ;
+  if (!s6dns_message_get_domain(&d, packet, packetlen, pos)) return 0 ;
   if (*pos + 4 > packetlen) return (errno = EPROTO, 0) ;
-  uint16_unpack_big(packet + *pos, qtype) ; *pos += 2 ;
+  uint16_unpack_big(packet + *pos, &qtype) ; *pos += 2 ;
   uint16_unpack_big(packet + *pos, &qclass) ; *pos += 2 ;
   if (qclass != S6DNS_C_IN) return (errno = ENOTSUP, 0) ;
   counts->qd-- ;
+  *name = d ;
+  *qtypep = qtype ;
   return 1 ;
 }
-- 
cgit v1.2.3