diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 14:20:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 14:20:47 +0200 |
| commit | 6339d1d8c858c8c748a8c631b564d6053f573fa8 (patch) | |
| tree | ac6c6c9403ae2ad3dd3b3c66a1f595fcc86220a9 | |
| parent | bc471f1d9046bf75a2e27d593ce9b13e4094ffdc (diff) | |
| parent | 140d5cf0f80c40ee8db3c7b24176e45b00be0572 (diff) | |
| download | rsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.tar.gz rsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.tar.xz rsyslog-6339d1d8c858c8c748a8c631b564d6053f573fa8.zip | |
Merge branch 'debian_lenny' into v3-stable
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | tools/omfile.c | 4 |
2 files changed, 12 insertions, 4 deletions
@@ -2,6 +2,9 @@ Version 3.20.6 [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.20.5 [v3-stable] (rgerhards), 2009-04-02 - bugfix: potential abort with DA queue after high watermark is reached @@ -246,7 +249,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 @@ -932,7 +937,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 d76e24ae..5e0f849b 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -74,7 +74,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 */ @@ -803,7 +803,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) { |