From 6dd0366a659bc4af1361ffdcec4ac4ee1f27ca03 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 9 Dec 2018 09:21:54 +0000 Subject: bugfix: s6-rc-bundle incorrectly checked against bundle prefixes --- src/s6-rc/s6-rc-bundle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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.3.1