From c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:46:27 +0000 Subject: [PATCH] r23780: Find and fix more GPL2 -> GPL3. Jeremy. --- 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 +- source/config.guess | 2 +- source/config.sub | 2 +- source/lib/ldb/config.guess | 2 +- source/lib/ldb/config.sub | 2 +- source/lib/ldb/swig/Ldb.py | 2 +- source/lib/replace/config.guess | 2 +- source/lib/replace/config.sub | 2 +- source/lib/talloc/config.guess | 2 +- source/lib/talloc/config.sub | 2 +- source/lib/talloc/talloc.3.xml | 2 +- source/lib/tdb/config.guess | 2 +- source/lib/tdb/config.sub | 2 +- source/lib/tdb/swig/Tdb.py | 2 +- source/po/de.msg | 2 +- source/po/en.msg | 2 +- source/po/fi.msg | 2 +- source/po/fr.msg | 2 +- source/po/genmsg | 2 +- source/po/it.msg | 2 +- source/po/ja.msg | 2 +- source/po/nl.msg | 2 +- source/po/pl.msg | 2 +- source/po/tr.msg | 2 +- source/python/setup.py | 2 +- source/script/gen-8bit-gap.sh.in | 2 +- source/script/mkbuildoptions.awk | 2 +- source/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 d0d57f6945f..7e19c0b2610 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 1c366dfde9a..f0fcaf63611 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 a43ea2126fb..441ad12f9ad 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 fd717944c5b..0e3a1a5f588 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 8487847b530..e870eb2996c 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 daf7ee5709d..cfacae2b38b 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 7fd4f1e4219..2077591ef76 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 d00131638ab..455619fd52a 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 02404c1d3ce..34bdc6edf12 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 6eca46e8545..8c57e0e4038 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 85059462056..460136fe2a6 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 d7024611f6b..7154fe7831e 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 0e80c883086..be0663e79df 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 5f2ab027772..32b31d1500c 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 fbe2f0cfbba..69c65c257c0 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 a903deeecbd..fd67b887a81 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 6b590f882f6..c44a627fa87 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 84ac07b9694..75834c738fe 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 df3f84b4afa..87f1ab46cc7 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 8afda670d27..5cc33621ac7 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 3dff4bda31d..ccec9151212 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 f659499f7e9..7cee717527e 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 68c5a2b05d1..c81f9968684 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 3a0c84008e6..55c49441f0f 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 e74b7361016..ce480578a5a 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 bb4148e52f6..d28138ff759 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 ea0cf472954..ec00d21bb2e 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 61a07542da6..3fe1fa9b6a0 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 aaf2958a95a..3a566d1e810 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 c70c23118a1..e0689e3bd46 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 292ad42cd2a..4933a2f702c 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 1dbc071e9b5..0d04c2b961d 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 6a4cdcab79d..5f8d8811b36 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 0dfcf0062ec..57e26836d3d 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 335dad00aae..52a7d01703d 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 6568b216642..36e0c0f9fd0 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/source/config.guess b/source/config.guess index d0d57f6945f..7e19c0b2610 100755 --- a/source/config.guess +++ b/source/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/source/config.sub b/source/config.sub index 1c366dfde9a..f0fcaf63611 100755 --- a/source/config.sub +++ b/source/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/source/lib/ldb/config.guess b/source/lib/ldb/config.guess index ad5281e66e9..30af5be0049 100755 --- a/source/lib/ldb/config.guess +++ b/source/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/source/lib/ldb/config.sub b/source/lib/ldb/config.sub index 1c366dfde9a..f0fcaf63611 100755 --- a/source/lib/ldb/config.sub +++ b/source/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/source/lib/ldb/swig/Ldb.py b/source/lib/ldb/swig/Ldb.py index c7e6191c8a6..8cc7663cc36 100644 --- a/source/lib/ldb/swig/Ldb.py +++ b/source/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/source/lib/replace/config.guess b/source/lib/replace/config.guess index ad5281e66e9..30af5be0049 100755 --- a/source/lib/replace/config.guess +++ b/source/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/source/lib/replace/config.sub b/source/lib/replace/config.sub index 1c366dfde9a..f0fcaf63611 100755 --- a/source/lib/replace/config.sub +++ b/source/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/source/lib/talloc/config.guess b/source/lib/talloc/config.guess index ad5281e66e9..30af5be0049 100755 --- a/source/lib/talloc/config.guess +++ b/source/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/source/lib/talloc/config.sub b/source/lib/talloc/config.sub index 1c366dfde9a..f0fcaf63611 100755 --- a/source/lib/talloc/config.sub +++ b/source/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/source/lib/talloc/talloc.3.xml b/source/lib/talloc/talloc.3.xml index 83ca67a4951..ed7466c9ee8 100644 --- a/source/lib/talloc/talloc.3.xml +++ b/source/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/source/lib/tdb/config.guess b/source/lib/tdb/config.guess index ad5281e66e9..30af5be0049 100755 --- a/source/lib/tdb/config.guess +++ b/source/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/source/lib/tdb/config.sub b/source/lib/tdb/config.sub index 1c366dfde9a..f0fcaf63611 100755 --- a/source/lib/tdb/config.sub +++ b/source/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/source/lib/tdb/swig/Tdb.py b/source/lib/tdb/swig/Tdb.py index aac7a90354d..7225638817c 100644 --- a/source/lib/tdb/swig/Tdb.py +++ b/source/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/source/po/de.msg b/source/po/de.msg index f5dc79b7247..6ccd6ebe0c2 100644 --- a/source/po/de.msg +++ b/source/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/source/po/en.msg b/source/po/en.msg index 47d156239f4..a3d43faa5ef 100644 --- a/source/po/en.msg +++ b/source/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/source/po/fi.msg b/source/po/fi.msg index 7206ac71a03..3a15863ce9f 100644 --- a/source/po/fi.msg +++ b/source/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/source/po/fr.msg b/source/po/fr.msg index 8de5de71500..39e5e94a945 100644 --- a/source/po/fr.msg +++ b/source/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/source/po/genmsg b/source/po/genmsg index 08d5bd222f8..c0c8b53f8e3 100755 --- a/source/po/genmsg +++ b/source/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/source/po/it.msg b/source/po/it.msg index c52ee65b85d..5989eaa65b1 100644 --- a/source/po/it.msg +++ b/source/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/source/po/ja.msg b/source/po/ja.msg index 206351b6172..03dd2be1789 100644 --- a/source/po/ja.msg +++ b/source/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/source/po/nl.msg b/source/po/nl.msg index b9f64234d6e..d89d45b8f0d 100644 --- a/source/po/nl.msg +++ b/source/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/source/po/pl.msg b/source/po/pl.msg index 6bc98f99d61..98d0308e93d 100644 --- a/source/po/pl.msg +++ b/source/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/source/po/tr.msg b/source/po/tr.msg index 2170d8bdf97..04debc4378e 100644 --- a/source/po/tr.msg +++ b/source/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/source/python/setup.py b/source/python/setup.py index 1efe5938e11..c2896200a66 100755 --- a/source/python/setup.py +++ b/source/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/source/script/gen-8bit-gap.sh.in b/source/script/gen-8bit-gap.sh.in index bcf64a4464f..b3919a234cc 100755 --- a/source/script/gen-8bit-gap.sh.in +++ b/source/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/source/script/mkbuildoptions.awk b/source/script/mkbuildoptions.awk index 20b20384a26..c8f252a34f1 100644 --- a/source/script/mkbuildoptions.awk +++ b/source/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/source/script/tests/dlopen.sh b/source/script/tests/dlopen.sh index 61279536927..dce95e876ef 100755 --- a/source/script/tests/dlopen.sh +++ b/source/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 c8b3b28779d..471aaab3151 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 070498d9589..8574c62bb50 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 cd84ab8ee08..74df6136b17 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 0831400e702..b4ace839ed2 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,