From: Samuel Thibault Date: Thu, 31 Dec 2020 04:30:58 +0000 (+0100) Subject: pppd: Make sure that the linkpidfile is always created (#185) X-Git-Tag: ppp-2.4.9~32 X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=5930c1c1d35dc1e7cce2987f2b11a9d5a4bf1551;p=ppp.git pppd: Make sure that the linkpidfile is always created (#185) From https://bugs.debian.org/284382 When pppd detaches from the parent normally, that is, without nodetach or updetach set, the linkpidfile is not created even when linkname is set. This is because the create_linkpidfile call in detach() is only made if the linkpidfile is filled in. However, linkpidfile is never filled in until create_linkpidfile has been called. IMHO the call should be made uncondtionally in detach() since create_linkpidfile does its own check on linkname anyway. Please note that the version of pppd in woody always wrote the linkpidfile after detaching. It did so in main() however. That call has now been removed which is why I'm seeing this problem. Signed-off-by: Samuel Thibault Co-authored-by: Herbert Xu --- diff --git a/pppd/main.c b/pppd/main.c index 2b53936..aaaa5c8 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -766,8 +766,7 @@ detach(void) /* update pid files if they have been written already */ if (pidfilename[0]) create_pidfile(pid); - if (linkpidfile[0]) - create_linkpidfile(pid); + create_linkpidfile(pid); exit(0); /* parent dies */ } setsid();