summaryrefslogtreecommitdiffstats
path: root/tcps_sess.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-16 16:25:45 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-16 16:25:45 +0100
commit29807bb3c918603f41eeaa2d15e89852a2657f9c (patch)
tree343c0856e562fac140eae3fabbb137ff39534fec /tcps_sess.c
parent17ee19bb5c15c666422358a215c118791b2cce7a (diff)
parent18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (diff)
downloadrsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.zip
rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.gz
rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.xz
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts: plugins/impstats/impstats.c
Diffstat (limited to 'tcps_sess.c')
-rw-r--r--tcps_sess.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/tcps_sess.c b/tcps_sess.c
index 0fd3e71..854d374 100644
--- a/tcps_sess.c
+++ b/tcps_sess.c
@@ -6,26 +6,26 @@
* NOTE: read comments in module-template.h to understand how this file
* works!
*
- * File begun on 2008-03-01 by RGerhards (extracted from tcpsrv.c)
+ * File begun on 2008-03-01 by RGerhards (extracted from tcpsrv.c, which
+ * based on the BSD-licensed syslogd.c)
*
- * 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 <stdlib.h>