do not create a pidfile, if none is specified in config

some people want to run tinyproxy with minimal configuration from
the command line (and as non-root), but tinyproxy insists on writing
a pid file, which only makes sense for usage as a service, hereby
forcing the user to either run it as root so it can write to the
default location, or start editing the default config file to work
around it.
and if no pidfile is specified in the config, it frankly doesn't
make sense to force creation of one anyway.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main.c b/src/main.c
index ae2a3a8..50cacca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -356,7 +356,7 @@ static void initialize_config_defaults (struct config_s *conf)
         conf->stathost = safestrdup (TINYPROXY_STATHOST);
         conf->idletimeout = MAX_IDLE_TIME;
         conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy/tinyproxy.log");
-        conf->pidpath = safestrdup (LOCALSTATEDIR "/run/tinyproxy/tinyproxy.pid");
+        conf->pidpath = NULL;
 }
 
 /**
@@ -496,7 +496,7 @@ main (int argc, char **argv)
         child_close_sock ();
 
         /* Remove the PID file */
-        if (unlink (config.pidpath) < 0) {
+        if (config.pidpath != NULL && unlink (config.pidpath) < 0) {
                 log_message (LOG_WARNING,
                              "Could not remove PID file \"%s\": %s.",
                              config.pidpath, strerror (errno));