summaryrefslogtreecommitdiffstats
path: root/tcpclt.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-18 14:08:24 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-18 14:08:24 +0100
commitac9afc4149db314d9c480232d70216960342e3e4 (patch)
treea35a772b89985b2e73b76ddedc28dd5e0b507bf6 /tcpclt.c
parente1e6ef71f4572de404d63a53f43c53c1b2b56803 (diff)
parent92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff)
downloadrsyslog-ac9afc4149db314d9c480232d70216960342e3e4.zip
rsyslog-ac9afc4149db314d9c480232d70216960342e3e4.tar.gz
rsyslog-ac9afc4149db314d9c480232d70216960342e3e4.tar.xz
Merge branch 'v5-stable' into master
Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
Diffstat (limited to 'tcpclt.c')
-rw-r--r--tcpclt.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/tcpclt.c b/tcpclt.c
index 285f104..af3dcf2 100644
--- a/tcpclt.c
+++ b/tcpclt.c
@@ -3,24 +3,23 @@
* This is the implementation of TCP-based syslog clients (the counterpart
* of the tcpsrv class).
*
- * Copyright 2007, 2008 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"