Merge branch 'v5-stable' into v6-stable

Conflicts:
	ChangeLog
	plugins/omprog/omprog.c
	runtime/rsyslog.h

3 files changed, 19 insertions, 17 deletions

diff --git a/runtime/conf.c b/runtime/conf.c
index 7afc4f97..6b812573 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>
@@ -448,6 +448,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 04d14212..0922c1bb 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -357,7 +357,7 @@ enum rsRetVal_				/** return value. All methods return this if not specified oth
 	RS_RET_ERR_LIBEE_INIT = -2201,	/**< cannot obtain libee ctx */
 	RS_RET_ERR_LIBLOGNORM_INIT = -2202,/**< cannot obtain liblognorm ctx */
 	RS_RET_ERR_LIBLOGNORM_SAMPDB_LOAD = -2203,/**< liblognorm sampledb load failed */
-
+	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