From 6dd0366a659bc4af1361ffdcec4ac4ee1f27ca03 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sun, 9 Dec 2018 09:21:54 +0000
Subject:  bugfix: s6-rc-bundle incorrectly checked against bundle prefixes

---
 NEWS                     | 6 ++++++
 doc/index.html           | 2 +-
 doc/upgrade.html         | 6 ++++++
 package/info             | 2 +-
 src/s6-rc/s6-rc-bundle.c | 4 ++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 602f522..a75f911 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-rc.
 
+In 0.4.1.1
+----------
+
+ - Bugfixes.
+
+
 In 0.4.1.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index a62d3ab..7db74a2 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -66,7 +66,7 @@ scripts are also run in a controlled environment.
 
 <ul>
  <li> The current released version of s6-rc is
-<a href="s6-rc-0.4.1.0.tar.gz">0.4.1.0</a>. </li>
+<a href="s6-rc-0.4.1.1.tar.gz">0.4.1.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-rc/">s6-rc
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 78fbdce..da9e976 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -30,6 +30,12 @@ minor and bugfix version changes.
 
 <h1> What has changed in s6-rc </h1>
 
+<h2> in 0.4.1.1 </h2>
+
+<ul>
+ <li> No functional changes. </li>
+</ul>
+
 <h2> in 0.4.1.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 009ffbb..93c0300 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-rc
-version=0.4.1.0
+version=0.4.1.1
 category=admin
 package_macro_name=S6RC
diff --git a/src/s6-rc/s6-rc-bundle.c b/src/s6-rc/s6-rc-bundle.c
index 59d5dfb..4a07804 100644
--- a/src/s6-rc/s6-rc-bundle.c
+++ b/src/s6-rc/s6-rc-bundle.c
@@ -118,9 +118,9 @@ static void modify_resolve (int fdcompiled, s6rc_db_t *db, char const *const *to
         cleanup(compiled) ;
         strerr_diefu3sys(111, "cdb_read ", compiled, "/resolve.cdb") ;
       }
-      for (i = 0 ; i < todeln ; i++) if (!strncmp(todel[i], ktmp, klen)) break ;
+      for (i = 0 ; i < todeln ; i++) if (klen == strlen(todel[i]) && !strncmp(todel[i], ktmp, klen)) break ;
       if (i < todeln) continue ;
-      for (i = 0 ; i < toaddn ; i++) if (!strncmp(toadd[i], ktmp, klen)) break ;
+      for (i = 0 ; i < toaddn ; i++) if (klen == strlen(toadd[i]) && !strncmp(toadd[i], ktmp, klen)) break ;
       if (i < toaddn) continue ;
       {
         uint32_t dlen = cdb_datalen(&cr) ;
-- 
cgit v1.2.3