From 9c0d3aa37810ae37b82951986fb4170c39fc9c41 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Mar 2015 00:57:48 +0000
Subject:  - Bugfix: s6-tcpclient and s6-tcpserver-access didn't s6dns_init() 
 - Version: rc for 2.1.0.1

---
 INSTALL                              |  6 +++---
 doc/index.html                       |  8 ++++----
 doc/upgrade.html                     |  9 +++++++++
 package/info                         |  2 +-
 src/conn-tools/s6-tcpclient.c        |  2 +-
 src/conn-tools/s6-tcpserver-access.c | 10 ++++++++++
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index 78b3c81..7d3d323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.2.1.0 or later: http://skarnet.org/software/skalibs/
-  - execline version 2.0.2.0 or later: http://skarnet.org/software/execline/
-  - s6 version 2.1.0.0 or later: http://skarnet.org/software/s6/
+  - skalibs version 2.3.2.0 or later: http://skarnet.org/software/skalibs/
+  - execline version 2.1.1.0 or later: http://skarnet.org/software/execline/
+  - s6 version 2.1.3.0 or later: http://skarnet.org/software/s6/
   - s6-dns version 2.0.0.2 or later: http://skarnet.org/software/s6-dns/
 
  This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index 5529ada..eb18bd6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -41,13 +41,13 @@ compiled with IPv6 support, s6-networking is IPv6-ready.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 4.0 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.2.0.0 or later. It's a build-time requirement. It's also a run-time
+2.3.2.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>
  <li> <a href="http://skarnet.org/software/execline/">execline</a> version
-2.0.2.0 or later. It's a build-time and run-time requirement. </li>
+2.1.1.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="http://skarnet.org/software/s6/">s6</a> version
-2.1.0.0 or later. It's a build-time and run-time requirement. </li>
+2.1.3.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="http://skarnet.org/software/s6-dns/">s6-dns</a> version
 2.0.0.2 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the s6-dns
@@ -64,7 +64,7 @@ libraries. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6-networking is <a href="s6-networking-2.1.0.0.tar.gz">2.1.0.0</a>. </li>
+ <li> The current released version of s6-networking is <a href="s6-networking-2.1.0.1.tar.gz">2.1.0.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6-networking git repository:
 <pre> git clone git://git.skarnet.org/s6-networking </pre> </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 486d9a1..bed293e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -17,6 +17,15 @@
 
 <h1> What has changed in s6-networking </h1>
 
+<h2> in 2.1.0.1 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.3.2.0. </li>
+ <li> execline dependency bumped to 2.1.1.0. </li>
+ <li> s6 dependency bumped to 2.1.3.0 </li>
+ <li> No functional changes (bugfix release) </li>
+</ul>
+
 <h2> in 2.1.0.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 87199f8..c16c543 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-networking
-version=2.1.0.0
+version=2.1.0.1
 category=net
 package_macro_name=S6_NETWORKING
diff --git a/src/conn-tools/s6-tcpclient.c b/src/conn-tools/s6-tcpclient.c
index 4686636..f2cb9d7 100644
--- a/src/conn-tools/s6-tcpclient.c
+++ b/src/conn-tools/s6-tcpclient.c
@@ -113,7 +113,7 @@ int main (int argc, char const *const *argv)
   tain_now_g() ;
   if (flags.timeout) tain_addsec_g(&deadline, flags.timeout) ;
   else tain_add_g(&deadline, &tain_infinite_relative) ;
-  
+  if (!s6dns_init()) strerr_diefu1sys(111, "init DNS") ; 
   {
     ip46_t ip[2][MAXIP] ;
     unsigned int j = 0 ;
diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c
index db2e2a5..2e14845 100644
--- a/src/conn-tools/s6-tcpserver-access.c
+++ b/src/conn-tools/s6-tcpserver-access.c
@@ -239,10 +239,20 @@ int main (int argc, char const *const *argv, char const *const *envp)
     byte_copy(tcpremotehost, protolen, proto) ;
     byte_copy(tcpremotehost + protolen, 11, "REMOTEHOST") ;
 
+    if (!s6dns_init())
+    {
+      if (verbosity >= 2) strerr_warnwu1sys("init DNS") ;
+      if (flagfatal)
+      {
+        e = 111 ;
+        goto reject ;
+      }
+    }
     if (localname)
     {
       if (!env_addmodif(&modifs, tcplocalhost, localname)) dienomem() ;
     }
+    else
     {
       s6dns_domain_arpafromip46(&blob[0].q, &localip) ;
       s6dns_domain_encode(&blob[0].q) ;
-- 
cgit v1.2.3