diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 19:01:44 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-14 19:01:44 +0100 |
commit | 6df41eaa88e3ded5d5101411e0f0ee70c7f350f1 (patch) | |
tree | 05a3312117a4e12154aae5f17ecc94d727aff731 | |
parent | e335a65788ccb9cd381dbd28982079a914f4ae4e (diff) | |
download | rsyslog-6df41eaa88e3ded5d5101411e0f0ee70c7f350f1.tar.gz rsyslog-6df41eaa88e3ded5d5101411e0f0ee70c7f350f1.tar.xz rsyslog-6df41eaa88e3ded5d5101411e0f0ee70c7f350f1.zip |
license change
after careful consideration of affected code
-rw-r--r-- | runtime/conf.c | 36 | ||||
-rw-r--r-- | runtime/conf.h | 29 |
2 files changed, 30 insertions, 35 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index bbd2147a..0da4a9c8 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -6,30 +6,26 @@ * because the config file handler will by dynamically be loaded and be * kept in memory only as long as the config file is actually being * processed. Thereafter, it shall be unloaded. -- rgerhards + * Please note that the original syslogd.c source was under BSD license + * at the time of the rsyslog fork from sysklogd. * - * TODO: the license MUST be changed to LGPL. However, we can not - * currently do that, because we use some sysklogd code to crunch - * the selector lines (e.g. *.info). That code is scheduled for removal - * as part of RainerScript. After this is done, we can change licenses. - * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2012 Rainer Gerhards and 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. */ #define CFGLNSIZ 4096 /* the maximum size of a configuraton file line, after re-combination */ #include "config.h" diff --git a/runtime/conf.h b/runtime/conf.h index 25b887be..7e1d6962 100644 --- a/runtime/conf.h +++ b/runtime/conf.h @@ -1,23 +1,22 @@ /* Definitions for config file handling (not yet an object). * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-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 INCLUDED_CONF_H #define INCLUDED_CONF_H |