Drop svc pidfile matching, only match against PID in pidfile

With the redesign from <svc/path/to/pidfile> to <pid/name:id> in d1fac6f
we moved to matching svc_t only against their PID, which could pop up in
any *.pid or */pid in /var/run.  This patch drops the (hopefully) last
remnants of the old <svc/> legacy.

To ensure we don't try reading the PID value from socket files, like
/var/run/initctl, we add simple fnmatch() of the inotified file.  Two
calls to fnmatch(), for portability reasons, not every system has GNU
libc extensions like FNM_EXTMATCH.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2021-02-23 20:26:57 +01:00
parent 8dc1ad00d5
commit dd6ebc3b65
2 changed files with 8 additions and 23 deletions
+4
View File
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
#include <fnmatch.h>
#include <glob.h>
#include <limits.h>
#include <paths.h>
@@ -69,6 +70,9 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
_d("Got dir: %s, name: %s, mask: %08x", dir, name, mask);
snprintf(fn, sizeof(fn), "%s/%s", dir, name);
if (fnmatch("*\\.pid", fn, 0) && fnmatch("*/pid", fn, 0))
return;
svc = svc_find_by_pidfile(fn);
if (!svc) {
_d("No matching svc for %s", fn);