diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:42:40 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-03 15:42:40 +0100 |
| commit | 90455378415e06bfee9109c77b8a595da1326f78 (patch) | |
| tree | d81fe6c633ff827f2834166a42cdde183da1bb0f | |
| parent | 4ed9a09e312c9ed5017d5caa98895eb80661e455 (diff) | |
| parent | 66d129c9ca24f6f3001fad9cc854c54a360df49e (diff) | |
| download | rsyslog-90455378415e06bfee9109c77b8a595da1326f78.tar.gz rsyslog-90455378415e06bfee9109c77b8a595da1326f78.tar.xz rsyslog-90455378415e06bfee9109c77b8a595da1326f78.zip | |
Merge branch 'v4-beta' into beta
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 6 |
2 files changed, 8 insertions, 1 deletions
@@ -322,6 +322,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? - imported changes from 4.5.6 and below --------------------------------------------------------------------------- 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 0f7325fc..33400971 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) |