From 2a9b4da0fa00d4ada504f49fafcadab7b0094331 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:46:27 +0000 Subject: r23780: Find and fix more GPL2 -> GPL3. Jeremy. (This used to be commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f) --- examples/VFS/config.guess | 2 +- examples/VFS/config.sub | 2 +- examples/pcap2nbench/COPYING | 2 +- examples/pcap2nbench/Makefile | 2 +- examples/pcap2nbench/closerequest.cpp | 2 +- examples/pcap2nbench/closerequest.hpp | 2 +- examples/pcap2nbench/ethernet.cpp | 2 +- examples/pcap2nbench/ethernet.hpp | 2 +- examples/pcap2nbench/ip.cpp | 2 +- examples/pcap2nbench/ip.hpp | 2 +- examples/pcap2nbench/main.cpp | 2 +- examples/pcap2nbench/ntcreateandxrequest.cpp | 2 +- examples/pcap2nbench/ntcreateandxrequest.hpp | 2 +- examples/pcap2nbench/ntcreateandxresponse.cpp | 2 +- examples/pcap2nbench/ntcreateandxresponse.hpp | 2 +- examples/pcap2nbench/readandxrequest.cpp | 2 +- examples/pcap2nbench/readandxrequest.hpp | 2 +- examples/pcap2nbench/readandxresponse.hpp | 2 +- examples/pcap2nbench/smb.cpp | 2 +- examples/pcap2nbench/smb.hpp | 2 +- examples/pcap2nbench/tcp.cpp | 2 +- examples/pcap2nbench/tcp.hpp | 2 +- examples/pcap2nbench/writeandxrequest.cpp | 2 +- examples/pcap2nbench/writeandxrequest.hpp | 2 +- examples/perfcounter/Makefile | 2 +- examples/perfcounter/perfcountd.init | 2 +- examples/printing/VampireDriversFunctions | 2 +- examples/scripts/eventlog/parselog.pl | 2 +- examples/scripts/shares/perl/modify_samba_config.pl | 2 +- examples/scripts/shares/python/SambaConfig.py | 2 +- examples/scripts/shares/python/SambaParm.py | 2 +- examples/scripts/shares/python/generate_parm_table.py | 4 ++-- examples/scripts/shares/python/modify_samba_config.py | 2 +- examples/scripts/shares/python/smbparm.py | 2 +- examples/scripts/users_and_groups/adduserstogroups.pl | 2 +- examples/scripts/users_and_groups/createdomobj.pl | 2 +- source3/config.guess | 2 +- source3/config.sub | 2 +- source3/lib/ldb/config.guess | 2 +- source3/lib/ldb/config.sub | 2 +- source3/lib/ldb/swig/Ldb.py | 2 +- source3/lib/replace/config.guess | 2 +- source3/lib/replace/config.sub | 2 +- source3/lib/talloc/config.guess | 2 +- source3/lib/talloc/config.sub | 2 +- source3/lib/talloc/talloc.3.xml | 2 +- source3/lib/tdb/config.guess | 2 +- source3/lib/tdb/config.sub | 2 +- source3/lib/tdb/swig/Tdb.py | 2 +- source3/po/de.msg | 2 +- source3/po/en.msg | 2 +- source3/po/fi.msg | 2 +- source3/po/fr.msg | 2 +- source3/po/genmsg | 2 +- source3/po/it.msg | 2 +- source3/po/ja.msg | 2 +- source3/po/nl.msg | 2 +- source3/po/pl.msg | 2 +- source3/po/tr.msg | 2 +- source3/python/setup.py | 2 +- source3/script/gen-8bit-gap.sh.in | 2 +- source3/script/mkbuildoptions.awk | 2 +- source3/script/tests/dlopen.sh | 2 +- testsuite/config/unix.exp | 2 +- testsuite/lib/compile.exp | 2 +- testsuite/smbd/se_access_check.exp | 2 +- testsuite/smbd/sec_ctx.exp | 2 +- 67 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/VFS/config.guess b/examples/VFS/config.guess index d0d57f6945..7e19c0b261 100755 --- a/examples/VFS/config.guess +++ b/examples/VFS/config.guess @@ -7,7 +7,7 @@ timestamp='2005-09-19' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/examples/VFS/config.sub b/examples/VFS/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/examples/VFS/config.sub +++ b/examples/VFS/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/COPYING b/examples/pcap2nbench/COPYING index a43ea2126f..441ad12f9a 100644 --- a/examples/pcap2nbench/COPYING +++ b/examples/pcap2nbench/COPYING @@ -295,7 +295,7 @@ the "copyright" line and a pointer to where the full notice is found. 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/Makefile b/examples/pcap2nbench/Makefile index fd717944c5..0e3a1a5f58 100644 --- a/examples/pcap2nbench/Makefile +++ b/examples/pcap2nbench/Makefile @@ -5,7 +5,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/closerequest.cpp b/examples/pcap2nbench/closerequest.cpp index 8487847b53..e870eb2996 100644 --- a/examples/pcap2nbench/closerequest.cpp +++ b/examples/pcap2nbench/closerequest.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/closerequest.hpp b/examples/pcap2nbench/closerequest.hpp index daf7ee5709..cfacae2b38 100644 --- a/examples/pcap2nbench/closerequest.hpp +++ b/examples/pcap2nbench/closerequest.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp index 7fd4f1e421..2077591ef7 100644 --- a/examples/pcap2nbench/ethernet.cpp +++ b/examples/pcap2nbench/ethernet.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ethernet.hpp b/examples/pcap2nbench/ethernet.hpp index d00131638a..455619fd52 100644 --- a/examples/pcap2nbench/ethernet.hpp +++ b/examples/pcap2nbench/ethernet.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ip.cpp b/examples/pcap2nbench/ip.cpp index 02404c1d3c..34bdc6edf1 100644 --- a/examples/pcap2nbench/ip.cpp +++ b/examples/pcap2nbench/ip.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ip.hpp b/examples/pcap2nbench/ip.hpp index 6eca46e854..8c57e0e403 100644 --- a/examples/pcap2nbench/ip.hpp +++ b/examples/pcap2nbench/ip.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/main.cpp b/examples/pcap2nbench/main.cpp index 8505946205..460136fe2a 100644 --- a/examples/pcap2nbench/main.cpp +++ b/examples/pcap2nbench/main.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ntcreateandxrequest.cpp b/examples/pcap2nbench/ntcreateandxrequest.cpp index d7024611f6..7154fe7831 100644 --- a/examples/pcap2nbench/ntcreateandxrequest.cpp +++ b/examples/pcap2nbench/ntcreateandxrequest.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ntcreateandxrequest.hpp b/examples/pcap2nbench/ntcreateandxrequest.hpp index 0e80c88308..be0663e79d 100644 --- a/examples/pcap2nbench/ntcreateandxrequest.hpp +++ b/examples/pcap2nbench/ntcreateandxrequest.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ntcreateandxresponse.cpp b/examples/pcap2nbench/ntcreateandxresponse.cpp index 5f2ab02777..32b31d1500 100644 --- a/examples/pcap2nbench/ntcreateandxresponse.cpp +++ b/examples/pcap2nbench/ntcreateandxresponse.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/ntcreateandxresponse.hpp b/examples/pcap2nbench/ntcreateandxresponse.hpp index fbe2f0cfbb..69c65c257c 100644 --- a/examples/pcap2nbench/ntcreateandxresponse.hpp +++ b/examples/pcap2nbench/ntcreateandxresponse.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/readandxrequest.cpp b/examples/pcap2nbench/readandxrequest.cpp index a903deeecb..fd67b887a8 100644 --- a/examples/pcap2nbench/readandxrequest.cpp +++ b/examples/pcap2nbench/readandxrequest.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/readandxrequest.hpp b/examples/pcap2nbench/readandxrequest.hpp index 6b590f882f..c44a627fa8 100644 --- a/examples/pcap2nbench/readandxrequest.hpp +++ b/examples/pcap2nbench/readandxrequest.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/readandxresponse.hpp b/examples/pcap2nbench/readandxresponse.hpp index 84ac07b969..75834c738f 100644 --- a/examples/pcap2nbench/readandxresponse.hpp +++ b/examples/pcap2nbench/readandxresponse.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/smb.cpp b/examples/pcap2nbench/smb.cpp index df3f84b4af..87f1ab46cc 100644 --- a/examples/pcap2nbench/smb.cpp +++ b/examples/pcap2nbench/smb.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/smb.hpp b/examples/pcap2nbench/smb.hpp index 8afda670d2..5cc33621ac 100644 --- a/examples/pcap2nbench/smb.hpp +++ b/examples/pcap2nbench/smb.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/tcp.cpp b/examples/pcap2nbench/tcp.cpp index 3dff4bda31..ccec915121 100644 --- a/examples/pcap2nbench/tcp.cpp +++ b/examples/pcap2nbench/tcp.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/tcp.hpp b/examples/pcap2nbench/tcp.hpp index f659499f7e..7cee717527 100644 --- a/examples/pcap2nbench/tcp.hpp +++ b/examples/pcap2nbench/tcp.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/writeandxrequest.cpp b/examples/pcap2nbench/writeandxrequest.cpp index 68c5a2b05d..c81f996868 100644 --- a/examples/pcap2nbench/writeandxrequest.cpp +++ b/examples/pcap2nbench/writeandxrequest.cpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/pcap2nbench/writeandxrequest.hpp b/examples/pcap2nbench/writeandxrequest.hpp index 3a0c84008e..55c49441f0 100644 --- a/examples/pcap2nbench/writeandxrequest.hpp +++ b/examples/pcap2nbench/writeandxrequest.hpp @@ -4,7 +4,7 @@ * * 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 + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/examples/perfcounter/Makefile b/examples/perfcounter/Makefile index e74b736101..ce480578a5 100644 --- a/examples/perfcounter/Makefile +++ b/examples/perfcounter/Makefile @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/examples/perfcounter/perfcountd.init b/examples/perfcounter/perfcountd.init index bb4148e52f..d28138ff75 100755 --- a/examples/perfcounter/perfcountd.init +++ b/examples/perfcounter/perfcountd.init @@ -4,7 +4,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/examples/printing/VampireDriversFunctions b/examples/printing/VampireDriversFunctions index ea0cf47295..ec00d21bb2 100644 --- a/examples/printing/VampireDriversFunctions +++ b/examples/printing/VampireDriversFunctions @@ -8,7 +8,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/eventlog/parselog.pl b/examples/scripts/eventlog/parselog.pl index 61a07542da..3fe1fa9b6a 100644 --- a/examples/scripts/eventlog/parselog.pl +++ b/examples/scripts/eventlog/parselog.pl @@ -7,7 +7,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/perl/modify_samba_config.pl b/examples/scripts/shares/perl/modify_samba_config.pl index aaf2958a95..3a566d1e81 100755 --- a/examples/scripts/shares/perl/modify_samba_config.pl +++ b/examples/scripts/shares/perl/modify_samba_config.pl @@ -8,7 +8,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/python/SambaConfig.py b/examples/scripts/shares/python/SambaConfig.py index c70c23118a..e0689e3bd4 100644 --- a/examples/scripts/shares/python/SambaConfig.py +++ b/examples/scripts/shares/python/SambaConfig.py @@ -9,7 +9,7 @@ from smbparm import parm_table ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/python/SambaParm.py b/examples/scripts/shares/python/SambaParm.py index 292ad42cd2..4933a2f702 100644 --- a/examples/scripts/shares/python/SambaParm.py +++ b/examples/scripts/shares/python/SambaParm.py @@ -6,7 +6,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/python/generate_parm_table.py b/examples/scripts/shares/python/generate_parm_table.py index 1dbc071e9b..0d04c2b961 100755 --- a/examples/scripts/shares/python/generate_parm_table.py +++ b/examples/scripts/shares/python/generate_parm_table.py @@ -7,7 +7,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -32,7 +32,7 @@ HEADER = """#################################################################### ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/python/modify_samba_config.py b/examples/scripts/shares/python/modify_samba_config.py index 6a4cdcab79..5f8d8811b3 100755 --- a/examples/scripts/shares/python/modify_samba_config.py +++ b/examples/scripts/shares/python/modify_samba_config.py @@ -7,7 +7,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/shares/python/smbparm.py b/examples/scripts/shares/python/smbparm.py index 0dfcf0062e..57e26836d3 100644 --- a/examples/scripts/shares/python/smbparm.py +++ b/examples/scripts/shares/python/smbparm.py @@ -7,7 +7,7 @@ ## ## 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 +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, diff --git a/examples/scripts/users_and_groups/adduserstogroups.pl b/examples/scripts/users_and_groups/adduserstogroups.pl index 335dad00aa..52a7d01703 100755 --- a/examples/scripts/users_and_groups/adduserstogroups.pl +++ b/examples/scripts/users_and_groups/adduserstogroups.pl @@ -10,7 +10,7 @@ # # 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) +# Software Foundation; either version 3 of the License, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, but WITHOUT diff --git a/examples/scripts/users_and_groups/createdomobj.pl b/examples/scripts/users_and_groups/createdomobj.pl index 6568b21664..36e0c0f9fd 100755 --- a/examples/scripts/users_and_groups/createdomobj.pl +++ b/examples/scripts/users_and_groups/createdomobj.pl @@ -10,7 +10,7 @@ # # 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) +# Software Foundation; either version 3 of the License, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, but WITHOUT diff --git a/source3/config.guess b/source3/config.guess index d0d57f6945..7e19c0b261 100755 --- a/source3/config.guess +++ b/source3/config.guess @@ -7,7 +7,7 @@ timestamp='2005-09-19' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/source3/config.sub b/source3/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/source3/config.sub +++ b/source3/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/ldb/config.guess b/source3/lib/ldb/config.guess index ad5281e66e..30af5be004 100755 --- a/source3/lib/ldb/config.guess +++ b/source3/lib/ldb/config.guess @@ -7,7 +7,7 @@ timestamp='2005-08-03' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/source3/lib/ldb/config.sub b/source3/lib/ldb/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/source3/lib/ldb/config.sub +++ b/source3/lib/ldb/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/ldb/swig/Ldb.py b/source3/lib/ldb/swig/Ldb.py index c7e6191c8a..8cc7663cc3 100644 --- a/source3/lib/ldb/swig/Ldb.py +++ b/source3/lib/ldb/swig/Ldb.py @@ -7,7 +7,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/replace/config.guess b/source3/lib/replace/config.guess index ad5281e66e..30af5be004 100755 --- a/source3/lib/replace/config.guess +++ b/source3/lib/replace/config.guess @@ -7,7 +7,7 @@ timestamp='2005-08-03' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/source3/lib/replace/config.sub b/source3/lib/replace/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/source3/lib/replace/config.sub +++ b/source3/lib/replace/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/talloc/config.guess b/source3/lib/talloc/config.guess index ad5281e66e..30af5be004 100755 --- a/source3/lib/talloc/config.guess +++ b/source3/lib/talloc/config.guess @@ -7,7 +7,7 @@ timestamp='2005-08-03' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/source3/lib/talloc/config.sub b/source3/lib/talloc/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/source3/lib/talloc/config.sub +++ b/source3/lib/talloc/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/talloc/talloc.3.xml b/source3/lib/talloc/talloc.3.xml index 83ca67a495..ed7466c9ee 100644 --- a/source3/lib/talloc/talloc.3.xml +++ b/source3/lib/talloc/talloc.3.xml @@ -721,7 +721,7 @@ if (ptr) memcpy(ptr, p, strlen(p)+1); 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/source3/lib/tdb/config.guess b/source3/lib/tdb/config.guess index ad5281e66e..30af5be004 100755 --- a/source3/lib/tdb/config.guess +++ b/source3/lib/tdb/config.guess @@ -7,7 +7,7 @@ timestamp='2005-08-03' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but diff --git a/source3/lib/tdb/config.sub b/source3/lib/tdb/config.sub index 1c366dfde9..f0fcaf6361 100755 --- a/source3/lib/tdb/config.sub +++ b/source3/lib/tdb/config.sub @@ -11,7 +11,7 @@ timestamp='2005-07-08' # # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/lib/tdb/swig/Tdb.py b/source3/lib/tdb/swig/Tdb.py index aac7a90354..7225638817 100644 --- a/source3/lib/tdb/swig/Tdb.py +++ b/source3/lib/tdb/swig/Tdb.py @@ -7,7 +7,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/de.msg b/source3/po/de.msg index f5dc79b724..6ccd6ebe0c 100644 --- a/source3/po/de.msg +++ b/source3/po/de.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/en.msg b/source3/po/en.msg index 47d156239f..a3d43faa5e 100644 --- a/source3/po/en.msg +++ b/source3/po/en.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/fi.msg b/source3/po/fi.msg index 7206ac71a0..3a15863ce9 100644 --- a/source3/po/fi.msg +++ b/source3/po/fi.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/fr.msg b/source3/po/fr.msg index 8de5de7150..39e5e94a94 100644 --- a/source3/po/fr.msg +++ b/source3/po/fr.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/genmsg b/source3/po/genmsg index 08d5bd222f..c0c8b53f8e 100755 --- a/source3/po/genmsg +++ b/source3/po/genmsg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/it.msg b/source3/po/it.msg index c52ee65b85..5989eaa65b 100644 --- a/source3/po/it.msg +++ b/source3/po/it.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/ja.msg b/source3/po/ja.msg index 206351b617..03dd2be178 100644 --- a/source3/po/ja.msg +++ b/source3/po/ja.msg @@ -4,7 +4,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/nl.msg b/source3/po/nl.msg index b9f64234d6..d89d45b8f0 100644 --- a/source3/po/nl.msg +++ b/source3/po/nl.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/pl.msg b/source3/po/pl.msg index 6bc98f99d6..98d0308e93 100644 --- a/source3/po/pl.msg +++ b/source3/po/pl.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/po/tr.msg b/source3/po/tr.msg index 2170d8bdf9..04debc4378 100644 --- a/source3/po/tr.msg +++ b/source3/po/tr.msg @@ -3,7 +3,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/python/setup.py b/source3/python/setup.py index 1efe5938e1..c2896200a6 100755 --- a/source3/python/setup.py +++ b/source3/python/setup.py @@ -8,7 +8,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/source3/script/gen-8bit-gap.sh.in b/source3/script/gen-8bit-gap.sh.in index bcf64a4464..b3919a234c 100755 --- a/source3/script/gen-8bit-gap.sh.in +++ b/source3/script/gen-8bit-gap.sh.in @@ -15,7 +15,7 @@ echo " * and source/script/gen-8bit-gap.sh script " echo " * " echo " * This program is free software; you can redistribute it and/or modify " echo " * it under the terms of the GNU General Public License as published by " -echo " * the Free Software Foundation; either version 2 of the License, or " +echo " * the Free Software Foundation; either version 3 of the License, or " echo " * (at your option) any later version. " echo " * " echo " * This program is distributed in the hope that it will be useful," diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 20b20384a2..c8f252a34f 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -7,7 +7,7 @@ BEGIN { print " "; print " This program is free software; you can redistribute it and/or modify"; print " it under the terms of the GNU General Public License as published by"; - print " the Free Software Foundation; either version 2 of the License, or"; + print " the Free Software Foundation; either version 3 of the License, or"; print " (at your option) any later version."; print " "; print " This program is distributed in the hope that it will be useful,"; diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh index 6127953692..dce95e876e 100755 --- a/source3/script/tests/dlopen.sh +++ b/source3/script/tests/dlopen.sh @@ -4,7 +4,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp index c8b3b28779..471aaab315 100644 --- a/testsuite/config/unix.exp +++ b/testsuite/config/unix.exp @@ -2,7 +2,7 @@ # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/testsuite/lib/compile.exp b/testsuite/lib/compile.exp index 070498d958..8574c62bb5 100644 --- a/testsuite/lib/compile.exp +++ b/testsuite/lib/compile.exp @@ -8,7 +8,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/testsuite/smbd/se_access_check.exp b/testsuite/smbd/se_access_check.exp index cd84ab8ee0..74df6136b1 100644 --- a/testsuite/smbd/se_access_check.exp +++ b/testsuite/smbd/se_access_check.exp @@ -8,7 +8,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, diff --git a/testsuite/smbd/sec_ctx.exp b/testsuite/smbd/sec_ctx.exp index 0831400e70..b4ace839ed 100644 --- a/testsuite/smbd/sec_ctx.exp +++ b/testsuite/smbd/sec_ctx.exp @@ -8,7 +8,7 @@ # # 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, -- cgit