svn commit: samba r17518 - in branches/SOC/mkhl/ldb-map/modules: .

[mkhl at samba.org]

Author: mkhl
Date: 2006-08-13 10:21:37 +0000 (Sun, 13 Aug 2006)
New Revision: 17518

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17518

Log:
The license change in r17512 was not valid, revert it.
The license change in r16505 was valid, stick to that.

Martin
Modified:
   branches/SOC/mkhl/ldb-map/modules/ldb_map.c
   branches/SOC/mkhl/ldb-map/modules/ldb_map_inbound.c
   branches/SOC/mkhl/ldb-map/modules/ldb_map_outbound.c


Changeset:
Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c
===================================================================
--- branches/SOC/mkhl/ldb-map/modules/ldb_map.c	2006-08-13 10:20:21 UTC (rev 17517)
+++ branches/SOC/mkhl/ldb-map/modules/ldb_map.c	2006-08-13 10:21:37 UTC (rev 17518)
@@ -4,23 +4,23 @@
    Copyright (C) Jelmer Vernooij 2005
    Copyright (C) Martin Kuehl <mkhl at samba.org> 2006
 
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
+   * NOTICE: this module is NOT released under the GNU LGPL license as
+   * other ldb code. This module is release under the GNU GPL v2 or
+   * later license.
+
+   This program 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 2 of the License, or
+   (at your option) any later version.
    
-   This 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 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
+   This program 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 this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   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 this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 /* 

Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map_inbound.c
===================================================================
--- branches/SOC/mkhl/ldb-map/modules/ldb_map_inbound.c	2006-08-13 10:20:21 UTC (rev 17517)
+++ branches/SOC/mkhl/ldb-map/modules/ldb_map_inbound.c	2006-08-13 10:21:37 UTC (rev 17518)
@@ -15,7 +15,7 @@
    
    This program 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
+   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

Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map_outbound.c
===================================================================
--- branches/SOC/mkhl/ldb-map/modules/ldb_map_outbound.c	2006-08-13 10:20:21 UTC (rev 17517)
+++ branches/SOC/mkhl/ldb-map/modules/ldb_map_outbound.c	2006-08-13 10:21:37 UTC (rev 17518)
@@ -15,7 +15,7 @@
    
    This program 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
+   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