From 0e87ba32bb6dc6597ff89b96afcf2814c75b6c6d Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Sat, 23 May 2020 21:18:13 +0200 Subject: [PATCH] do not fail hard if pid file is not writeable in inetd mode --- ChangeLog | 2 ++ server/main.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df0b6ab..0061024 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ Version NEXT display port number if we can't listen on it minor whitespace cleanup + do not fail hard if we can't write to pid file and running from + inetd Version 2.8.1b29 - 24 Aug 2019 added scons command line argument without-fspscan=yes for building diff --git a/server/main.c b/server/main.c index 1d398dc..1b5592d 100644 --- a/server/main.c +++ b/server/main.c @@ -324,7 +324,7 @@ int main (int argc, char ** argv) new pid to it after we setuid()+fork() */ #ifndef LAMERPACK - if (pidfile(pidlogname)) { + if (! inetd_mode && pidfile(pidlogname)) { fprintf(stderr,"Error: can not write pidfile %s - exiting.\n",pidlogname); exit(8);/* cannot write pid file - exit */ }