summaryrefslogtreecommitdiff
path: root/runtime/errmsg.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-02-12 11:22:00 +0100
committerMichael Biebl <biebl@debian.org>2012-02-12 11:22:00 +0100
commit366cf57abdb1a9fec6f5dc3563e2243d1a883a1a (patch)
tree41c1f44a1e64e33180ae75ef39f0a919b3dd091d /runtime/errmsg.c
parenta7a3afdd81c8809fbc4927b360e1cb59e2e16b2e (diff)
downloadrsyslog-366cf57abdb1a9fec6f5dc3563e2243d1a883a1a.tar.gz
Imported Upstream version 5.8.7upstream/5.8.7
Diffstat (limited to 'runtime/errmsg.c')
-rw-r--r--runtime/errmsg.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/runtime/errmsg.c b/runtime/errmsg.c
index 3c3ee02..0924694 100644
--- a/runtime/errmsg.c
+++ b/runtime/errmsg.c
@@ -3,26 +3,27 @@
* Module begun 2008-03-05 by Rainer Gerhards, based on some code
* from syslogd.c. I converted this module to lgpl and have checked that
* all contributors agreed to that step.
+ * Now moving to ASL 2.0, and contributor checks tell that there is no need
+ * to take further case, as the code now boils to be either my own or, a few lines,
+ * of the original BSD-licenses sysklogd code. rgerhards, 2012-01-16
*
- * Copyright 2008 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2008-2012 Adiscon GmbH.
*
* This file is part of the rsyslog runtime library.
*
- * The rsyslog runtime library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The rsyslog runtime library 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with the rsyslog runtime library. If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- * A copy of the LGPL can be found in the file "COPYING.LESSER" 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"