From 10e18ae583228bbfe5eb066a4a237ac67238892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 30 Jul 2011 00:52:36 +0300
Subject: Do not require pid dir to exist when not running as a daemon.

---
 HISTORY      | 1 +
 vdradmind.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 174b7d4..0bdddf3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,7 @@ VDR-Portal: amair
 - Added: -L/--logfile command line arg for overriding config (Ville Skyttä).
 - Changed: Honor config logging options with --nofork (Ville Skyttä).
 - Changed: Specifying -L or -l turns logging on (Ville Skyttä).
+- Improved: Do not require pid dir when not running as daemon (Ville Skyttä).
 
 2011-06-03: 3.6.8
 - Updated: Dutch translation (Submitted by Roel Koelewijn).
diff --git a/vdradmind.pl b/vdradmind.pl
index 5327bf7..1977208 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -784,7 +784,7 @@ sub check_permissions {
     check_rw_dir($CERTSDIR) if ($UseSSL);
     check_rw_dir($TEMPLATECACHE) or $rc = 0;
     check_rw_dir($LOGDIR) or $rc = 0;
-    check_rw_file($PIDFILE) or $rc = 0;
+    check_rw_file($PIDFILE) or $rc = 0 if $DAEMON;
     check_rw_file($CONFFILE) or $rc = 0;
 
     if ($CONFIG{AT_FUNC} || $FEATURES{AUTOTIMER}) {
-- 
cgit v1.2.3