summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-16 14:59:04 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-16 14:59:04 +0200
commitf07d74a87f91b6fe2f5091ec2547b7886ab3a23e (patch)
tree7477eed4aac75e44e700f25fdd59bf1e9a56e95e
parentba5a59128f6559d58cdd4defe46a9db564d3e2c1 (diff)
parent5ccec36e8d69230ddbd94d1b63bc9f6518c5ade8 (diff)
downloadrsyslog-f07d74a87f91b6fe2f5091ec2547b7886ab3a23e.tar.gz
rsyslog-f07d74a87f91b6fe2f5091ec2547b7886ab3a23e.tar.xz
rsyslog-f07d74a87f91b6fe2f5091ec2547b7886ab3a23e.zip
Merge branch 'master' into nextmaster
-rw-r--r--ChangeLog21
-rw-r--r--tools/omfile.c4
2 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b25c32d0..b33f492c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@ Version 4.3.0 [DEVEL] (rgerhards), 2009-03-??
Version 4.1.7 [BETA] (rgerhards), 2009-04-??
- bugfix: $InputTCPMaxSessions config directive was accepted, but not
honored. This resulted in a fixed upper limit of 200 connections.
+- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
+ It has now been changed to 0700. For some background, please see
+ http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
---------------------------------------------------------------------------
Version 4.1.6 [DEVEL] (rgerhards), 2009-04-07
- added new "csv" property replacer options to enable simple creation
@@ -158,6 +161,9 @@ version before switching to this one.
Version 3.22.0 [v3-stable] (rgerhards), 2009-04-??
- bugfix: $InputTCPMaxSessions config directive was accepted, but not
honored. This resulted in a fixed upper limit of 200 connections.
+- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
+ It has now been changed to 0700. For some background, please see
+ http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
---------------------------------------------------------------------------
Version 3.21.11 [BETA] (rgerhards), 2009-04-03
- build system improvements contributed by Michael Biebl - thx!
@@ -313,9 +319,13 @@ Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18
- imported all changes from 3.18.1 until today (some quite important,
see below)
---------------------------------------------------------------------------
-Version 3.20.6 [v3-stable] (rgerhards), 2009-04-??
+Version 3.20.6 [v3-stable] (rgerhards), 2009-04-16
+- this is the last v3-stable for the 3.20.x series
- bugfix: $InputTCPMaxSessions config directive was accepted, but not
honored. This resulted in a fixed upper limit of 200 connections.
+- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
+ It has now been changed to 0700. For some background, please see
+ http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
---------------------------------------------------------------------------
Version 3.20.5 [v3-stable] (rgerhards), 2009-04-02
- bugfix: potential abort with DA queue after high watermark is reached
@@ -560,7 +570,9 @@ Version 3.19.0 (rgerhards), 2008-05-06
for the patch
---------------------------------------------------------------------------
Version 3.18.7 (rgerhards), 2008-12-??
-=======
+- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
+ It has now been changed to 0700. For some background, please see
+ http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
- fixed a potential segfault condition with $AllowedSender directive
On HUP, the root pointers were not properly cleaned up. Thanks to
Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
@@ -1246,7 +1258,10 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
-Version 2.0.7 V2-STABLE (rgerhards), 2008-??-??
+Version 2.0.7 V2-STABLE (rgerhards), 2008-04-14
+- bugfix: the default for $DirCreateMode was 0644, and as such wrong.
+ It has now been changed to 0700. For some background, please see
+ http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
- bugfix: "$CreateDirs off" also disabled file creation
Thanks to William Tisater for analyzing this bug and providing a patch.
The actual code change is heavily based on William's patch.
diff --git a/tools/omfile.c b/tools/omfile.c
index 36f160d1..c7283e4d 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -78,7 +78,7 @@ typedef struct s_dynaFileCacheEntry dynaFileCacheEntry;
/* globals for default values */
static int iDynaFileCacheSize = 10; /* max cache for dynamic files */
static int fCreateMode = 0644; /* mode to use when creating files */
-static int fDirCreateMode = 0644; /* mode to use when creating files */
+static int fDirCreateMode = 0700; /* mode to use when creating files */
static int bFailOnChown; /* fail if chown fails? */
static uid_t fileUID; /* UID to be used for newly created files */
static uid_t fileGID; /* GID to be used for newly created files */
@@ -847,7 +847,7 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
bFailOnChown = 1;
iDynaFileCacheSize = 10;
fCreateMode = 0644;
- fDirCreateMode = 0644;
+ fDirCreateMode = 0700;
bCreateDirs = 1;
bEnableSync = 0;
if(pszTplName != NULL) {