From: Jeremy Allison Date: Mon, 9 Jul 2007 19:46:27 +0000 (+0000) Subject: r23780: Find and fix more GPL2 -> GPL3. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2a9b4da0fa00d4ada504f49fafcadab7b0094331;p=metze%2Fsamba%2Fwip.git r23780: Find and fix more GPL2 -> GPL3. Jeremy. (This used to be commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f) --- diff --git a/examples/VFS/config.guess b/examples/VFS/config.guess index d0d57f6945f8..7e19c0b26109 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 1c366dfde9ab..f0fcaf636114 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 a43ea2126fb6..441ad12f9ad1 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 fd717944c5b1..0e3a1a5f5884 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 8487847b530f..e870eb2996c8 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 daf7ee5709d8..cfacae2b38b7 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 7fd4f1e42198..2077591ef763 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 d00131638ab5..455619fd52a8 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 02404c1d3ceb..34bdc6edf120 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 6eca46e8545e..8c57e0e40381 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 850594620566..460136fe2a67 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 d7024611f6b4..7154fe7831ed 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 0e80c8830861..be0663e79df0 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 5f2ab0277729..32b31d1500c8 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 fbe2f0cfbbad..69c65c257c07 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 a903deeecbdc..fd67b887a81f 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 6b590f882f64..c44a627fa877 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 84ac07b9694d..75834c738fea 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 df3f84b4afa0..87f1ab46cc78 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 8afda670d274..5cc33621ac73 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 3dff4bda31de..ccec91512120 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 f659499f7e90..7cee717527e4 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 68c5a2b05d14..c81f99686849 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 3a0c84008e6d..55c49441f0f2 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 e74b7361016a..ce480578a5a6 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 bb4148e52f62..d28138ff7590 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 ea0cf4729542..ec00d21bb2e4 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 61a07542da6b..3fe1fa9b6a08 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 aaf2958a95a3..3a566d1e810a 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 c70c23118a14..e0689e3bd469 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 292ad42cd2aa..4933a2f702ca 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 1dbc071e9b56..0d04c2b961d8 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 6a4cdcab79d0..5f8d8811b36a 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 0dfcf0062ec8..57e26836d3df 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 335dad00aaec..52a7d01703d7 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 6568b216642f..36e0c0f9fd08 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 d0d57f6945f8..7e19c0b26109 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 1c366dfde9ab..f0fcaf636114 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 ad5281e66e9d..30af5be00498 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 1c366dfde9ab..f0fcaf636114 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 c7e6191c8a62..8cc7663cc364 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 ad5281e66e9d..30af5be00498 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 1c366dfde9ab..f0fcaf636114 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 ad5281e66e9d..30af5be00498 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 1c366dfde9ab..f0fcaf636114 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 83ca67a49511..ed7466c9ee8c 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 ad5281e66e9d..30af5be00498 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 1c366dfde9ab..f0fcaf636114 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 aac7a90354d6..7225638817c3 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 f5dc79b7247b..6ccd6ebe0c29 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 47d156239f4d..a3d43faa5ef6 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 7206ac71a031..3a15863ce9f6 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 8de5de715006..39e5e94a945a 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 08d5bd222f86..c0c8b53f8e35 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 c52ee65b85d5..5989eaa65b1c 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 206351b61723..03dd2be17899 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 b9f64234d6e1..d89d45b8f0d2 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 6bc98f99d612..98d0308e93d1 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 2170d8bdf973..04debc4378eb 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 1efe5938e11f..c2896200a66f 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 bcf64a4464f5..b3919a234cc2 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 20b20384a265..c8f252a34f1d 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 61279536927c..dce95e876efb 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 c8b3b28779db..471aaab3151c 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 070498d95895..8574c62bb502 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 cd84ab8ee081..74df6136b170 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 0831400e7027..b4ace839ed20 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,