From 0b5980df018f39af270de26f7a1b94d963a827db Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 21 Jan 2012 17:41:15 +0100 Subject: licensing change --- plugins/imklog/imklog.c | 31 +++++++++++++++---------------- plugins/imklog/imklog.h | 29 ++++++++++++++--------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 7994c5eb..4b7473e3 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -18,25 +18,24 @@ * Please note that this file replaces the klogd daemon that was * also present in pre-v3 versions of rsyslog. * - * Copyright (C) 2008, 2009 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 . - * - * 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 diff --git a/plugins/imklog/imklog.h b/plugins/imklog/imklog.h index c183026d..22f10053 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-2008 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 . - * - * 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 -- cgit From 0ba1782dff46992c24b3b99ae7f6f4ef41fb35b5 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 24 Jan 2012 18:03:21 +0100 Subject: 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) --- ChangeLog | 3 +++ runtime/conf.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5a5fd6e..2bf59521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ --------------------------------------------------------------------------- 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: $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/runtime/conf.c b/runtime/conf.c index 0da4a9c8..69a96306 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 #include @@ -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; -- cgit From 6c01355579c0ff3da7e8beb8acc59698dbc845c5 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 26 Jan 2012 13:04:45 +0100 Subject: relicense unlimited_select.h under ASL 2.0 after receiving permission from Red Hat legal (given in email from Tomas Heinrich) --- runtime/unlimited_select.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/runtime/unlimited_select.h b/runtime/unlimited_select.h index 32dadc03..165f3a09 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 . - * - * 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 -- cgit From cbb9684731c1d56dbe3622141f397f3afbb0f6dc Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 27 Jan 2012 12:49:54 +0100 Subject: bugfix: omprog made rsyslog abort on startup if not binary to execute was configured --- ChangeLog | 2 ++ plugins/omprog/omprog.c | 6 ++++++ runtime/rsyslog.h | 1 + 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2bf59521..58468a20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ 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/omprog/omprog.c b/plugins/omprog/omprog.c index 61b81838..633525ac 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -299,6 +299,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/rsyslog.h b/runtime/rsyslog.h index 03f5120d..43e97171 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -384,6 +384,7 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_INTERNAL_ERROR = -2175, /**< rsyslogd internal error, unexpected code path reached */ RS_RET_OUTDATED_STMT = -2184, /**< some outdated statement/functionality is being used in conf file */ + 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) */ -- cgit