diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:25:39 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:25:39 +0100 |
commit | 115718de967f673fc89ce8b8be1b16081ca4dde1 (patch) | |
tree | 31c8ba575f8db55ea7f769d9b1907c65bcc6aa12 | |
parent | aafa9b41a5f06b88f11df5c837427e171e1048d7 (diff) | |
parent | c2970de8b0dd07c52f3a107e5ec3de55010c9999 (diff) | |
download | rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.tar.gz rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.tar.xz rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
plugins/imklog/imklog.c
plugins/imklog/imklog.h
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | plugins/imklog/imklog.c | 31 | ||||
-rw-r--r-- | plugins/imklog/imklog.h | 29 | ||||
-rw-r--r-- | plugins/ommysql/ommysql.c | 30 | ||||
-rw-r--r-- | plugins/omprog/omprog.c | 6 | ||||
-rw-r--r-- | runtime/conf.c | 5 | ||||
-rw-r--r-- | runtime/rsyslog.h | 1 | ||||
-rw-r--r-- | runtime/unlimited_select.h | 29 |
8 files changed, 79 insertions, 63 deletions
@@ -118,6 +118,12 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- +Version 5.8.8 [V5-stable] 2012-0?-?? +- bugfix: omprog made rsyslog abort on startup if not binary to + execute was configured +- bugfix: imklog invalidly computed facility and severity + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 +--------------------------------------------------------------------------- Version 5.8.7 [V5-stable] 2012-01-17 - bugfix: instabilities when using RFC5424 header fields Thanks to Kaiwang Chen for the patch @@ -975,6 +981,11 @@ increase. output module interface --------------------------------------------------------------------------- Version 4.8.1 [v4-stable], 2011-09-?? +- increased max config file line size to 64k + We now also emit an error message if even 64k is not enough (not + doing so previously may rightfully be considered as a bug) +- bugfix: omprog made rsyslog abort on startup if not binary to + execute was configured - bugfix: $ActionExecOnlyOnce interval did not work properly Thanks to Tomas Heinrich for the patch - bugfix: potential abort if ultra-large file io buffers are used and diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index e82dd1f4..6e83e780 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -21,25 +21,24 @@ * To test under Linux: * echo test1 > /dev/kmsg * - * Copyright (C) 2008-2011 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2008-2012 Adiscon GmbH * * This file is part of rsyslog. * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. -*/ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "config.h" #include "rsyslog.h" #include <stdio.h> diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index 39bdeb5c..7a060df4 100644 --- a/plugins/imklog/imklog.h +++ b/plugins/imklog/imklog.h @@ -5,24 +5,23 @@ * Major change: 2008-04-09: switched to a driver interface for * several platforms * - * Copyright 2007-2011 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef IMKLOG_H_INCLUDED #define IMKLOG_H_INCLUDED 1 diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c index f8bb4aa6..58e347bf 100644 --- a/plugins/ommysql/ommysql.c +++ b/plugins/ommysql/ommysql.c @@ -6,24 +6,22 @@ * * File begun on 2007-07-20 by RGerhards (extracted from syslogd.c) * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Adiscon GmbH. * * This file is part of rsyslog. - * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include "config.h" #include "rsyslog.h" diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index db461a00..12e94251 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -300,6 +300,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omprog:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); + if(szBinary == NULL) { + errmsg.LogError(0, RS_RET_CONF_RQRD_PARAM_MISSING, + "no binary to execute specified"); + ABORT_FINALIZE(RS_RET_CONF_RQRD_PARAM_MISSING); + } + CHKmalloc(pData->szBinary = (uchar*) strdup((char*)szBinary)); /* check if a non-standard template is to be applied */ if(*(p-1) == ';') diff --git a/runtime/conf.c b/runtime/conf.c index cbba1790..46a89281 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -27,7 +27,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define CFGLNSIZ 4096 /* the maximum size of a configuraton file line, after re-combination */ +#define CFGLNSIZ 64*1024 /* the maximum size of a configuraton file line, after re-combination */ #include "config.h" #include <stdlib.h> #include <stdio.h> @@ -446,6 +446,9 @@ processConfFile(uchar *pConfFile) if ((p - cbuf) > CFGLNSIZ - 30) { /* Oops the buffer is full - what now? */ cline = cbuf; + dbgprintf("buffer overflow extending config file\n"); + errmsg.LogError(0, RS_RET_CONFIG_ERROR, + "error: config file line %d too long", iLnNbr); } else { *p = 0; cline = p; diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 06438081..adcd4656 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -348,6 +348,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_MISSING_WHITESPACE = -2185, /**< whitespace is missing in some config construct */ RS_RET_OK_WARN = -2186, /**< config part: everything was OK, but a warning message was emitted */ + RS_RET_CONF_RQRD_PARAM_MISSING = -2208,/**< required parameter in config object is missing */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ diff --git a/runtime/unlimited_select.h b/runtime/unlimited_select.h index 3fa7eb06..ec1e4498 100644 --- a/runtime/unlimited_select.h +++ b/runtime/unlimited_select.h @@ -2,24 +2,23 @@ * Tweak the macros for accessing fd_set so that the select() syscall * won't be limited to a particular number of file descriptors. * - * Copyright 2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2009-2012 Adiscon GmbH. * * This file is part of rsyslog. * - * Rsyslog is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Rsyslog is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. - * - * A copy of the GPL can be found in the file "COPYING" in this distribution. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef UNLIMITED_SELECT_H_INCLUDED |