diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:46:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:46:35 +0100 |
| commit | 4cefc40064a07f6c9c8ab8def2ecbb87b336debe (patch) | |
| tree | 8c4298451800487647b3ec566effa0a2ebef5481 | |
| parent | 1fc8e4372bf0c7ccc7f54abe387933dc8a2de670 (diff) | |
| parent | 90455378415e06bfee9109c77b8a595da1326f78 (diff) | |
| download | rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.tar.gz rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.tar.bz2 rsyslog-4cefc40064a07f6c9c8ab8def2ecbb87b336debe.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tools/syslogd.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -54,6 +54,9 @@ Version 5.3.7 [BETA] (rgerhards), 2010-01-?? - bugfix: potential segfaults during queue shutdown (bugs require certain non-standard settings to appear) Thanks to varmojfekoj for the patch [imported from 4.5.8] + [backport from 5.5.2] +- bugfix: wrong memory assignment for a config variable (probably + without causing any harm) [backport from 5.2.2] - bugfix: rsyslog hangs when writing to a named pipe which nobody was reading. Thanks to Michael Biebl for reporting this bug. Bugzilla entry: http://bugzilla.adiscon.com/show_bug.cgi?id=169 @@ -378,6 +381,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? Thanks for varmojfekoj for pointing me at this bug. --------------------------------------------------------------------------- Version 4.5.8 [v4-beta] (rgerhards), 2010-01-?? +- (slightly) enhanced support for FreeBSD by setting _PATH_MODDIR to + the correct value on FreeBSD. + Thanks to Cristiano for the patch. - bugfix: -d did not enable display of debug messages regression from introduction of "debug on demand" mode Thanks to Michael Biebl for reporting this bug diff --git a/tools/syslogd.c b/tools/syslogd.c index e9e7f08c..d0261a1d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -167,7 +167,11 @@ static rsRetVal GlobalClassExit(void); #endif #ifndef _PATH_MODDIR -#define _PATH_MODDIR "/lib/rsyslog/" +# if defined(__FreeBSD__) +# define _PATH_MODDIR "/usr/local/lib/rsyslog/" +# else +# define _PATH_MODDIR "/lib/rsyslog/" +# endif #endif #if defined(SYSLOGD_PIDNAME) |