r23779: Change from v2 or later to v3 or later.

Jeremy.
(This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3)

84 files changed, 84 insertions, 84 deletions

diff --git a/source3/include/MacExtensions.h b/source3/include/MacExtensions.h
index d09370ed9f..d1f538e137 100644
--- a/source3/include/MacExtensions.h
+++ b/source3/include/MacExtensions.h
@@ -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/include/ads_cldap.h b/source3/include/ads_cldap.h
index 77ab19a5f2..135e324e3b 100644
--- a/source3/include/ads_cldap.h
+++ b/source3/include/ads_cldap.h
@@ -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/source3/include/ads_dns.h b/source3/include/ads_dns.h
index 6c3430e21b..68bbbbca7e 100644
--- a/source3/include/ads_dns.h
+++ b/source3/include/ads_dns.h
@@ -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/source3/include/adt_tree.h b/source3/include/adt_tree.h
index a053013a9b..e3c840d1e1 100644
--- a/source3/include/adt_tree.h
+++ b/source3/include/adt_tree.h
@@ -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/source3/include/asn_1.h b/source3/include/asn_1.h
index 63a18c4923..9d8f0904f9 100644
--- a/source3/include/asn_1.h
+++ b/source3/include/asn_1.h
@@ -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/source3/include/auth.h b/source3/include/auth.h
index 4e7eb469ba..1a202a3828 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -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/include/authdata.h b/source3/include/authdata.h
index dbaeda6b9a..2bb1936f48 100644
--- a/source3/include/authdata.h
+++ b/source3/include/authdata.h
@@ -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/source3/include/byteorder.h b/source3/include/byteorder.h
index 0eef557306..9b0ef98ce4 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -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/source3/include/charset.h b/source3/include/charset.h
index 5ac8d17486..9b35736ea9 100644
--- a/source3/include/charset.h
+++ b/source3/include/charset.h
@@ -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/source3/include/client.h b/source3/include/client.h
index 741ce6470d..fc28e4e82c 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -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/include/clitar.h b/source3/include/clitar.h
index b7731172d6..78d347b5c0 100644
--- a/source3/include/clitar.h
+++ b/source3/include/clitar.h
@@ -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 (at your
+ * 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 WITHOUT
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 79d8abe59d..1c38fcafad 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -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/source3/include/dbwrap.h b/source3/include/dbwrap.h
index eae53e8ed4..b98e1646ce 100644
--- a/source3/include/dbwrap.h
+++ b/source3/include/dbwrap.h
@@ -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/source3/include/debug.h b/source3/include/debug.h
index ae9fbeba92..4ad471f142 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -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/include/dlinklist.h b/source3/include/dlinklist.h
index e590bc3e7e..7620364c84 100644
--- a/source3/include/dlinklist.h
+++ b/source3/include/dlinklist.h
@@ -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/source3/include/doserr.h b/source3/include/doserr.h
index e9dab2adef..adc8e41f89 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -9,7 +9,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/include/dynconfig.h b/source3/include/dynconfig.h
index aebc9c941e..ea33a81cbb 100644
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -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/source3/include/event.h b/source3/include/event.h
index ce687eca6d..293bc779a6 100644
--- a/source3/include/event.h
+++ b/source3/include/event.h
@@ -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/source3/include/fake_file.h b/source3/include/fake_file.h
index 63ba41d786..9ba7e5de92 100644
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -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/source3/include/gpo.h b/source3/include/gpo.h
index 431702e300..5d65c2dc13 100644
--- a/source3/include/gpo.h
+++ b/source3/include/gpo.h
@@ -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/source3/include/hmacmd5.h b/source3/include/hmacmd5.h
index 89ea3fed80..65987bc37e 100644
--- a/source3/include/hmacmd5.h
+++ b/source3/include/hmacmd5.h
@@ -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/source3/include/includes.h b/source3/include/includes.h
index ebcb071b1c..f60d0895b1 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -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/include/intl.h b/source3/include/intl.h
index 58f21e359b..8e83e42fc7 100644
--- a/source3/include/intl.h
+++ b/source3/include/intl.h
@@ -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/source3/include/libmsrpc.h b/source3/include/libmsrpc.h
index 7b28d31333..be82216d2f 100644
--- a/source3/include/libmsrpc.h
+++ b/source3/include/libmsrpc.h
@@ -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/source3/include/libmsrpc_internal.h b/source3/include/libmsrpc_internal.h
index d00badab36..214bb8c806 100644
--- a/source3/include/libmsrpc_internal.h
+++ b/source3/include/libmsrpc_internal.h
@@ -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/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 5d674264d8..545792a7e5 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -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
+  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/include/locking.h b/source3/include/locking.h
index d61b5fe1e4..aea976bf9c 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -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/source3/include/mapping.h b/source3/include/mapping.h
index 8ba784e98c..4b36abfebb 100644
--- a/source3/include/mapping.h
+++ b/source3/include/mapping.h
@@ -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/source3/include/messages.h b/source3/include/messages.h
index 8c829712eb..6aa7d41d42 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -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/source3/include/module.h b/source3/include/module.h
index 8b317a9d59..4c31b57224 100644
--- a/source3/include/module.h
+++ b/source3/include/module.h
@@ -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/source3/include/msdfs.h b/source3/include/msdfs.h
index 05cfe4e102..ef9dd78afe 100644
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -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/source3/include/nameserv.h b/source3/include/nameserv.h
index 9f6bf76a09..aeeaf89f7a 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -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/include/nt_printing.h b/source3/include/nt_printing.h
index c2dde7d478..d8157141a2 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -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/include/nt_status.h b/source3/include/nt_status.h
index 4d083106d3..990ca6466d 100644
--- a/source3/include/nt_status.h
+++ b/source3/include/nt_status.h
@@ -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/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 2108520b15..2c63ac79f8 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -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/include/nterr.h b/source3/include/nterr.h
index e14f341de1..dd90d91d7f 100644
--- a/source3/include/nterr.h
+++ b/source3/include/nterr.h
@@ -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/include/ntioctl.h b/source3/include/ntioctl.h
index b4b8169a51..743d805e83 100644
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -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/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index d15ce18021..a4ae5610be 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -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/include/ntquotas.h b/source3/include/ntquotas.h
index dac1173770..137f3a1381 100644
--- a/source3/include/ntquotas.h
+++ b/source3/include/ntquotas.h
@@ -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/source3/include/packet.h b/source3/include/packet.h
index 9f36482705..b60ab80d72 100644
--- a/source3/include/packet.h
+++ b/source3/include/packet.h
@@ -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/source3/include/passdb.h b/source3/include/passdb.h
index c3af0f4f11..effbd605ce 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -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/include/popt_common.h b/source3/include/popt_common.h
index 9db5ecc3d1..0d940f3eba 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -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/source3/include/printing.h b/source3/include/printing.h
index 21caff0a83..407e6a1ae5 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -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/include/privileges.h b/source3/include/privileges.h
index 72b2c91324..e9579f9460 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -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
+   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/include/pstring.h b/source3/include/pstring.h
index 92870e4cae..61da6b3bd4 100644
--- a/source3/include/pstring.h
+++ b/source3/include/pstring.h
@@ -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
+   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/include/rap.h b/source3/include/rap.h
index 993dfa7e33..33b3cef7a1 100755
--- a/source3/include/rap.h
+++ b/source3/include/rap.h
@@ -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/source3/include/reg_db.h b/source3/include/reg_db.h
index 9a35f91e5d..2c55c38c72 100644
--- a/source3/include/reg_db.h
+++ b/source3/include/reg_db.h
@@ -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/source3/include/reg_objects.h b/source3/include/reg_objects.h
index b108d6d082..71ae24aff7 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -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/source3/include/regfio.h b/source3/include/regfio.h
index 3f0c10e895..ee278a6427 100644
--- a/source3/include/regfio.h
+++ b/source3/include/regfio.h
@@ -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/source3/include/rpc_brs.h b/source3/include/rpc_brs.h
index cd0928d470..1a078c686d 100644
--- a/source3/include/rpc_brs.h
+++ b/source3/include/rpc_brs.h
@@ -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/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 94803dbaea..444c124a97 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -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/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 09e5f25da8..17ca2e82f8 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -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/include/rpc_ds.h b/source3/include/rpc_ds.h
index 05258fb306..6701b68bfa 100644
--- a/source3/include/rpc_ds.h
+++ b/source3/include/rpc_ds.h
@@ -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/source3/include/rpc_eventlog.h b/source3/include/rpc_eventlog.h
index 547568e93b..36ac08699d 100644
--- a/source3/include/rpc_eventlog.h
+++ b/source3/include/rpc_eventlog.h
@@ -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/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 1d575c8955..534fc1ac0a 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -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/include/rpc_misc.h b/source3/include/rpc_misc.h
index 62bef2cb38..552aa95caf 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -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/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 940709346f..90399063e6 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -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/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h
index 947794bba1..6a4e198dc3 100644
--- a/source3/include/rpc_ntsvcs.h
+++ b/source3/include/rpc_ntsvcs.h
@@ -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/source3/include/rpc_perfcount.h b/source3/include/rpc_perfcount.h
index eecc24148d..bf0090e908 100644
--- a/source3/include/rpc_perfcount.h
+++ b/source3/include/rpc_perfcount.h
@@ -9,7 +9,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/include/rpc_perfcount_defs.h b/source3/include/rpc_perfcount_defs.h
index 16d83c7b11..4afa9ca9fa 100644
--- a/source3/include/rpc_perfcount_defs.h
+++ b/source3/include/rpc_perfcount_defs.h
@@ -9,7 +9,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/include/rpc_samr.h b/source3/include/rpc_samr.h
index d34ecdb5fb..c8cd2390b6 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -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
+   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/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 8396040a9b..24074ccde1 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -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/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index baa120445e..56d1cbfb4c 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -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/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index f4bf509f7c..79b940f77b 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -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/source3/include/safe_string.h b/source3/include/safe_string.h
index 3a732e11e1..2467a0ef27 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -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/source3/include/samba_linux_quota.h b/source3/include/samba_linux_quota.h
index 02b3e5169b..e7661acc33 100644
--- a/source3/include/samba_linux_quota.h
+++ b/source3/include/samba_linux_quota.h
@@ -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/source3/include/secrets.h b/source3/include/secrets.h
index 610a14b52b..be685705cd 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -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 (at your
+ * 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 WITHOUT
diff --git a/source3/include/session.h b/source3/include/session.h
index 1220f66dc5..9c66ea9059 100644
--- a/source3/include/session.h
+++ b/source3/include/session.h
@@ -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/include/smb.h b/source3/include/smb.h
index 95889f86e5..c099e2a4d5 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -11,7 +11,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/include/smb_acls.h b/source3/include/smb_acls.h
index 0d2cbdde52..2e8ee2630f 100644
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -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/source3/include/smb_launchd.h b/source3/include/smb_launchd.h
index 2e758a4de1..4093afb2bc 100644
--- a/source3/include/smb_launchd.h
+++ b/source3/include/smb_launchd.h
@@ -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/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index 144317cc1e..5bd7050422 100644
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -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/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 81d4dc0666..51db8ea178 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -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/include/smbldap.h b/source3/include/smbldap.h
index 67061fec86..54807d2c27 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -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/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 7b04a185b4..1635f913a7 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -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/include/spnego.h b/source3/include/spnego.h
index 66abe31705..5c75bc5e55 100644
--- a/source3/include/spnego.h
+++ b/source3/include/spnego.h
@@ -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/include/srvstr.h b/source3/include/srvstr.h
index 99a7407a6a..98b119e7cc 100644
--- a/source3/include/srvstr.h
+++ b/source3/include/srvstr.h
@@ -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/source3/include/sysquotas.h b/source3/include/sysquotas.h
index bfb9466b39..e014c21f8b 100644
--- a/source3/include/sysquotas.h
+++ b/source3/include/sysquotas.h
@@ -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/source3/include/trans2.h b/source3/include/trans2.h
index 8b31b431c7..d4c0e89e38 100644
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -9,7 +9,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/include/util_getent.h b/source3/include/util_getent.h
index b67758ba23..2cccc2560c 100644
--- a/source3/include/util_getent.h
+++ b/source3/include/util_getent.h
@@ -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/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 5fd05f59fc..4760e4cd97 100644
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -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/source3/include/vfs.h b/source3/include/vfs.h
index d968ba9d82..fdba306c1f 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -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/include/vfs_macros.h b/source3/include/vfs_macros.h
index 48321ddad0..a398dbd39c 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -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/source3/include/xfile.h b/source3/include/xfile.h
index 89fa9d1e11..a2dc7d7132 100644
--- a/source3/include/xfile.h
+++ b/source3/include/xfile.h
@@ -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,