summaryrefslogtreecommitdiffstats
path: root/template.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-25 11:55:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-25 11:55:41 +0200
commit8939ccfffd3a0580ead376234ad64a9602d4e4e6 (patch)
tree1749d023b626b2d30d9b9273b0d4f11fcbffea1b /template.c
parent0f52727043736b1e411bc60309ed18d41a4f1234 (diff)
parent0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (diff)
downloadrsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.zip
rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.gz
rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.xz
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
Diffstat (limited to 'template.c')
-rw-r--r--template.c39
1 files changed, 24 insertions, 15 deletions
diff --git a/template.c b/template.c
index 994a902..a80ac6f 100644
--- a/template.c
+++ b/template.c
@@ -1,25 +1,30 @@
/* This is the template processing code of rsyslog.
- * Please see syslogd.c for license information.
* begun 2004-11-17 rgerhards
*
- * Copyright 2004, 2007 Rainer Gerhards and Adiscon
+ * Copyright 2004-2012 Rainer Gerhards and Adiscon
*
* 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.
+ * 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.
*
- * 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.
+ * Note: there is a tiny bit of code left where I could not get any response
+ * from the author if this code can be placed under ASL2.0. I have guarded this
+ * with #ifdef STRICT_GPLV3. Only if that macro is defined, the code will be
+ * compiled. Otherwise this feature is not present. The plan is to do a
+ * different implementation in the future to get rid of this problem.
+ * rgerhards, 2012-08-25
*/
#include "config.h"
@@ -721,7 +726,9 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
/* now we fall through the "regular" FromPos code */
#endif /* #ifdef FEATURE_REGEXP */
if(*p == 'F') {
+#ifdef STRICT_GPLV3
pTpe->data.field.field_expand = 0;
+#endif
/* we have a field counter, so indicate it in the template */
++p; /* eat 'F' */
if (*p == ':') {
@@ -749,10 +756,12 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
pTpe->data.field.field_delim = 9;
} else {
pTpe->data.field.field_delim = iNum;
+# ifdef STRICT_GPLV3
if (*p == '+') {
pTpe->data.field.field_expand = 1;
p ++;
}
+# endif
if(*p == ',') { /* real fromPos? */
++p;
iNum = 0;