From 49c2bc380c34c346dafffe5c5a4059fa2f604680 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 15 Feb 2011 11:06:15 +0100
Subject: improved error reporting for $WorkDirectory

non-existance and other detectable problems are now reported,
and the work directory is NOT set in this case
---
 ChangeLog         |  3 +++
 runtime/glbl.c    | 37 ++++++++++++++++++++++++++++++++++++-
 runtime/rsyslog.h |  1 +
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7d2bbc20..2a22f5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Version 5.7.4  [V5-BETA] (rgerhards), 2011-02-??
 - added pmsnare parser module (written by David Lang)
 - enhanced imfile to support non-cancel input termination
 - improved systemd socket activation thanks to Marius Tomaschweski
+- improved error reporting for $WorkDirectory
+  non-existance and other detectable problems are now reported,
+  and the work directory is NOT set in this case
 - bugfix: pmsnare causded abort under some conditions
 - bugfix: abort if imfile reads file line of more than 64KiB
   Thanks to Peter Eisentraut for reporting and analysing this problem.
diff --git a/runtime/glbl.c b/runtime/glbl.c
index c7bb88a5..68eb276c 100644
--- a/runtime/glbl.c
+++ b/runtime/glbl.c
@@ -31,6 +31,9 @@
 #include "config.h"
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <assert.h>
 
 #include "rsyslog.h"
@@ -40,6 +43,7 @@
 #include "glbl.h"
 #include "prop.h"
 #include "atomic.h"
+#include "errmsg.h"
 
 /* some defaults */
 #ifndef DFLT_NETSTRM_DRVR
@@ -49,6 +53,7 @@
 /* static data */
 DEFobjStaticHelpers
 DEFobjCurrIf(prop)
+DEFobjCurrIf(errmsg)
 
 /* static data
  * For this object, these variables are obviously what makes the "meat" of the
@@ -147,6 +152,35 @@ static void SetGlobalInputTermination(void)
 }
 
 
+/* This function is used to set the global work directory name. 
+ * It verifies that the provided directory actually exists and
+ * emits an error message if not.
+ * rgerhards, 2011-02-16
+ */
+static rsRetVal setWorkDir(void __attribute__((unused)) *pVal, uchar *pNewVal)
+{
+	DEFiRet;
+	struct stat sb;
+
+	if(stat((char*) pNewVal, &sb) != 0) {
+		errmsg.LogError(0, RS_RET_ERR_WRKDIR, "$WorkDirectory: %s can not be "
+				"accessed, probably does not exist - directive ignored", pNewVal);
+		ABORT_FINALIZE(RS_RET_ERR_WRKDIR);
+	}
+
+	if(!S_ISDIR(sb.st_mode)) {
+		errmsg.LogError(0, RS_RET_ERR_WRKDIR, "$WorkDirectory: %s not a directory - directive ignored", 
+				pNewVal);
+		ABORT_FINALIZE(RS_RET_ERR_WRKDIR);
+	}
+
+	free(pszWorkDir);
+	pszWorkDir = pNewVal;
+
+finalize_it:
+	RETiRet;
+}
+
 /* return our local hostname. if it is not set, "[localhost]" is returned
  */
 static uchar*
@@ -354,9 +388,10 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 BEGINAbstractObjClassInit(glbl, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(prop, CORE_COMPONENT));
+	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 
 	/* register config handlers (TODO: we need to implement a way to unregister them) */
-	CHKiRet(regCfSysLineHdlr((uchar *)"workdirectory", 0, eCmdHdlrGetWord, NULL, &pszWorkDir, NULL));
+	CHKiRet(regCfSysLineHdlr((uchar *)"workdirectory", 0, eCmdHdlrGetWord, setWorkDir, NULL, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"dropmsgswithmaliciousdnsptrrecords", 0, eCmdHdlrBinary, NULL, &bDropMalPTRMsgs, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdriver", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvr, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"defaultnetstreamdrivercafile", 0, eCmdHdlrGetWord, NULL, &pszDfltNetstrmDrvrCAF, NULL));
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index 0402f159..78e61bcb 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -340,6 +340,7 @@ enum rsRetVal_				/** return value. All methods return this if not specified oth
 	RS_RET_ERR_HDFS_WRITE = -2178, /**< error writing to HDFS */
 	RS_RET_ERR_HDFS_OPEN = -2179, /**< error during hdfsOpen (e.g. file does not exist) */
 	RS_RET_FILE_NOT_SPECIFIED = -2180, /**< file name not configured where this was required */
+	RS_RET_ERR_WRKDIR = -2181, /**< problems with the rsyslog working directory */
 
 	/* RainerScript error messages (range 1000.. 1999) */
 	RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */
-- 
cgit