Convert some more files to GPLv3.

(This used to be commit ebe5e8399422eb7e2ff4deb546338823e2718907)

diff --git a/source4/build/pasn1/asn1.yp b/source4/build/pasn1/asn1.yp
index 9a77bbc31a12d075783cb2c38449365881b05e4e..7fc834ff2b716fb545029042761304a1b7d65d58 100644 (file)
--- a/source4/build/pasn1/asn1.yp
+++ b/source4/build/pasn1/asn1.yp
@@ -1,7 +1,7 @@
 ########################
 # ASN.1 Parse::Yapp parser
 # Copyright (C) Stefan (metze) Metzmacher <metze@samba.org>
 ########################
 # ASN.1 Parse::Yapp parser
 # Copyright (C) Stefan (metze) Metzmacher <metze@samba.org>

-# released under the GNU GPL version 2 or later
+# released under the GNU GPL version 3 or later

 
 
 
 
 
 

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 78b5a09f78bc245c964bdeab44ab54e65e05e69a..56b05691bbdd1dc2bf3bb5a6f8f0c5e3554f3264 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -6,7 +6,7 @@
    Copyright (C) Stefan Metzmacher <metze@samba.org> 2007
 
    * NOTICE: this module is NOT released under the GNU LGPL license as
    Copyright (C) Stefan Metzmacher <metze@samba.org> 2007
 
    * NOTICE: this module is NOT released under the GNU LGPL license as

-   * other ldb code. This module is release under the GNU GPL v2 or
+   * other ldb code. This module is release under the GNU GPL v3 or

    * later license.
 
    This program is free software; you can redistribute it and/or modify
    * later license.
 
    This program is free software; you can redistribute it and/or modify

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 5407db99565c063806e03d4d9c6403d009581f71..3b67ca19d35b2c55434770ebba90cfa07a0feb60 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -5,7 +5,7 @@
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
 
    * NOTICE: this module is NOT released under the GNU LGPL license as
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
 
    * NOTICE: this module is NOT released under the GNU LGPL license as

-   * other ldb code. This module is release under the GNU GPL v2 or
+   * other ldb code. This module is release under the GNU GPL v3 or

    * later license.
 
    This program is free software; you can redistribute it and/or modify
    * later license.
 
    This program is free software; you can redistribute it and/or modify

diff --git a/source4/dsdb/samdb/ldb_modules/schema.c b/source4/dsdb/samdb/ldb_modules/schema.c
index ff9530ca92b0bfd69390f32c2b1919f937c3a7c8..f2c4d383051dfe48e33743a5fd2958772616d1ff 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/schema.c
+++ b/source4/dsdb/samdb/ldb_modules/schema.c
@@ -25,8 +25,6 @@
  *  Description: add schema check functionality
  *
  *  Author: Simo Sorce
  *  Description: add schema check functionality
  *
  *  Author: Simo Sorce

- *
- *  License: GNU GPL v2 or Later

  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

diff --git a/source4/dsdb/samdb/ldb_modules/schema_syntax.c b/source4/dsdb/samdb/ldb_modules/schema_syntax.c
index f737cc6fdc0fc62d5ace7cab629c5604bcd8e351..d800e4b6d242e9b24e0106d58a08582c1eed0427 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/schema_syntax.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_syntax.c
@@ -25,8 +25,6 @@
  *  Description: add schema syntax functionality
  *
  *  Author: Simo Sorce
  *  Description: add schema syntax functionality
  *
  *  Author: Simo Sorce

- *
- *  License: GNU GPL v2 or Later

  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

diff --git a/source4/dsdb/samdb/ldb_modules/schema_syntax.h b/source4/dsdb/samdb/ldb_modules/schema_syntax.h
index fa3fdbe5a2e32702db9e066020ae5b04f465c1ce..37f7584d41722774912930b54a2bcdae89dd0054 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/schema_syntax.h
+++ b/source4/dsdb/samdb/ldb_modules/schema_syntax.h
@@ -25,8 +25,6 @@
  *  Description: add schema syntax functionality
  *
  *  Author: Simo Sorce
  *  Description: add schema syntax functionality
  *
  *  Author: Simo Sorce

- *
- *  License: GNU GPL v2 or Later

  */
 
 
  */
 
 

diff --git a/source4/lib/policy/adm.h b/source4/lib/policy/adm.h
index 90889fe5fa38a68f3a390a494661acca98d05f1f..c541ced6ffebb663df1d37d5035112d10a9a3812 100644 (file)
--- a/source4/lib/policy/adm.h
+++ b/source4/lib/policy/adm.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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/policy/dumpadm.c b/source4/lib/policy/dumpadm.c
index 1553ce62f610a1c2de7423b36b7431eb95293c52..2ed5abf111dcdda7211ea3a9b3f3f8c6b138c9c7 100644 (file)
--- a/source4/lib/policy/dumpadm.c
+++ b/source4/lib/policy/dumpadm.c
@@ -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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/policy/lex.c b/source4/lib/policy/lex.c
index c2899aa80834c7333a3117696a20cf1fc6c57373..6d524445c9bc30620327e85ddef8db696a79f19f 100644 (file)
--- a/source4/lib/policy/lex.c
+++ b/source4/lib/policy/lex.c
@@ -572,7 +572,7 @@ char *yytext;
    
    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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/policy/lex.l b/source4/lib/policy/lex.l
index 199cd228c0ebf0c3a20b845d40304b67945f53e7..dc1f0aa34edd97f2df8fd999e9b0096451b0bbfc 100644 (file)
--- a/source4/lib/policy/lex.l
+++ b/source4/lib/policy/lex.l
@@ -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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/policy/parse_adm.y b/source4/lib/policy/parse_adm.y
index 1dc21cf1d31506537bb8acddb506c9b4e57fa842..23c5e7730e8e067be7babba7a27e2a0f640c400b 100644 (file)
--- a/source4/lib/policy/parse_adm.y
+++ b/source4/lib/policy/parse_adm.y
@@ -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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/hive.c b/source4/lib/registry/hive.c
index ad6a6421abb45e92c27f65f5c1514761f9704e3c..fc2d0fe869e91a281ba9ed70ce98f015aa3bf02f 100644 (file)
--- a/source4/lib/registry/hive.c
+++ b/source4/lib/registry/hive.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/hive.h b/source4/lib/registry/hive.h
index 87f335663d1e36cd2aff64dd95b8aa47ba76496a..2410885718dc23966d5f1eedd1b9874e2b63970d 100644 (file)
--- a/source4/lib/registry/hive.h
+++ b/source4/lib/registry/hive.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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/local.c b/source4/lib/registry/local.c
index 3e463100c9cb80380f02066cfd3b6a45010f8c91..5bf2d86588f97987a33b4641143418f6fe142fe1 100644 (file)
--- a/source4/lib/registry/local.c
+++ b/source4/lib/registry/local.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/patchfile.h b/source4/lib/registry/patchfile.h
index 9289390685296b030e3c4e91cd0e4568711559a6..d586aa4c314570204cb044b61b1e10f958433460 100644 (file)
--- a/source4/lib/registry/patchfile.h
+++ b/source4/lib/registry/patchfile.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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/patchfile_dotreg.c b/source4/lib/registry/patchfile_dotreg.c
index 6de642ecb810a0667cd012786e50be57bbdf0286..5150c90291524e48d4ed1a8b5d14329131b6ecad 100644 (file)
--- a/source4/lib/registry/patchfile_dotreg.c
+++ b/source4/lib/registry/patchfile_dotreg.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/patchfile_preg.c b/source4/lib/registry/patchfile_preg.c
index 0d39e67450f82baba5b003f9ed0fba50287fa891..8f02a0b5e382fec672f03dbc6e1a3062e7aeb9f5 100644 (file)
--- a/source4/lib/registry/patchfile_preg.c
+++ b/source4/lib/registry/patchfile_preg.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/tests/hive.c b/source4/lib/registry/tests/hive.c
index 1e56f125c5d168eac047c08a69328aff48881181..70b0241b043a241c575075f3acd0479bf585b7fc 100644 (file)
--- a/source4/lib/registry/tests/hive.c
+++ b/source4/lib/registry/tests/hive.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c
index 7d14b3a4121d4c5d5246ed98daf094d537960d2b..e5e34c11e0bd2368845b0f347db28b16ddedb8be 100644 (file)
--- a/source4/lib/registry/tests/registry.c
+++ b/source4/lib/registry/tests/registry.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/libnet/libnet_group.h b/source4/libnet/libnet_group.h
index 5da194c36edf2d2f644f997a0efbce144e6c87a4..3156b1f32f560a377f8c4e20ea83e5d37666621a 100644 (file)
--- a/source4/libnet/libnet_group.h
+++ b/source4/libnet/libnet_group.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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/source4/pidl/idl.yp b/source4/pidl/idl.yp
index c7ca0c76042f6f24ccd8f3c9abdb4c6394ca268d..a0323af8ee6532af10522ef466d35f3df75111be 100644 (file)
--- a/source4/pidl/idl.yp
+++ b/source4/pidl/idl.yp
@@ -1,7 +1,7 @@
 ########################
 # IDL Parse::Yapp parser
 # Copyright (C) Andrew Tridgell <tridge@samba.org>
 ########################
 # IDL Parse::Yapp parser
 # Copyright (C) Andrew Tridgell <tridge@samba.org>

-# released under the GNU GPL version 2 or later
+# released under the GNU GPL version 3 or later

 
 
 
 
 
 

diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index ea41289dce28772e29f3fc9d48a6135c63f08ad2..4dfc3365a17496e8e55ddb779dfe7423a94e3b1e 100755 (executable)
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -3,7 +3,7 @@ exec smbscript "$0" ${1+"$@"}
 /*
   provide information on connected users and open files
   Copyright Andrew Tridgell 2005
 /*
   provide information on connected users and open files
   Copyright Andrew Tridgell 2005

-  Released under the GNU GPL v2 or later
+  Released under the GNU GPL version 3 or later

 */     
 
 libinclude("base.js");
 */     
 
 libinclude("base.js");

diff --git a/source4/scripting/bin/winreg b/source4/scripting/bin/winreg
index 2114394f455fb8472515d9c9464bf9b0cfa4a803..883c6d7ee3b76da80733eb6c27a3e494e667393b 100755 (executable)
--- a/source4/scripting/bin/winreg
+++ b/source4/scripting/bin/winreg
@@ -3,7 +3,7 @@ exec smbscript "$0" ${1+"$@"}
 /*
   tool to manipulate a remote registry
   Copyright Andrew Tridgell 2005
 /*
   tool to manipulate a remote registry
   Copyright Andrew Tridgell 2005

-  Released under the GNU GPL v2 or later
+  Released under the GNU GPL version 3 or later

 */     
 
 var options = GetOptions(ARGV,
 */     
 
 var options = GetOptions(ARGV,

diff --git a/source4/scripting/libjs/auth.js b/source4/scripting/libjs/auth.js
index 73d864521829acda9342f717856e17883127fd33..3fe81d0ea764b2d0217ebf76d8f314c9f0d30cca 100644 (file)
--- a/source4/scripting/libjs/auth.js
+++ b/source4/scripting/libjs/auth.js
@@ -1,7 +1,7 @@
 /*
        auth js library functions
        Copyright Andrew Tridgell 2005
 /*
        auth js library functions
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL v2 or later
+       released under the GNU GPL version 3 or later

 */
 
 
 */
 
 

diff --git a/source4/scripting/libjs/base.js b/source4/scripting/libjs/base.js
index df0bfe0ce93e757edf93b7f9ca449da945542de0..d861073a074cf81de229bdd4d235e2feda42fba8 100644 (file)
--- a/source4/scripting/libjs/base.js
+++ b/source4/scripting/libjs/base.js
@@ -1,7 +1,7 @@
 /*
        base js library functions
        Copyright Andrew Tridgell 2005
 /*
        base js library functions
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL v2 or later
+       released under the GNU GPL version 3 or later

 */
 
 if (global["HAVE_BASE_JS"] != undefined) {
 */
 
 if (global["HAVE_BASE_JS"] != undefined) {

diff --git a/source4/scripting/libjs/encoder.js b/source4/scripting/libjs/encoder.js
index d96b8595470184f6d1751f77e33ffe6c47e76bf9..6cb780c00d62b0411dbb4480d2279e481766b91c 100644 (file)
--- a/source4/scripting/libjs/encoder.js
+++ b/source4/scripting/libjs/encoder.js
@@ -2,7 +2,7 @@
        server side js functions for encoding/decoding objects into linear strings
 
        Copyright Andrew Tridgell 2005
        server side js functions for encoding/decoding objects into linear strings
 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 /*
        usage:
 */
 /*
        usage:

diff --git a/source4/scripting/libjs/management.js b/source4/scripting/libjs/management.js
index e54b5e283bed08d0d007bfd54e639873b6a8e251..4a43275156702559c39e0940db76bb15cbe048a2 100644 (file)
--- a/source4/scripting/libjs/management.js
+++ b/source4/scripting/libjs/management.js
@@ -1,7 +1,7 @@
 /*
        backend code for Samba4 management
        Copyright Andrew Tridgell 2005
 /*
        backend code for Samba4 management
        Copyright Andrew Tridgell 2005

-       Released under the GNU GPL v2 or later
+       Released under the GNU GPL version 3 or later

 */
 
 
 */
 
 

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 86baa0c003810037393eefb843b84980371037a2..51e2785762bd79a29c2beba5b478f08066f80a05 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -1,7 +1,7 @@
 /*
        backend code for provisioning a Samba4 server
        Copyright Andrew Tridgell 2005
 /*
        backend code for provisioning a Samba4 server
        Copyright Andrew Tridgell 2005

-       Released under the GNU GPL v2 or later
+       Released under the GNU GPL version 3 or later

 */
 
 sys = sys_init();
 */
 
 sys = sys_init();

diff --git a/source4/scripting/libjs/samr.js b/source4/scripting/libjs/samr.js
index a7d7d964fb1682e7eb32e993cc7676248f129011..6e8c70af3cb30d55b4e879f83b9efbacf0b6f124 100644 (file)
--- a/source4/scripting/libjs/samr.js
+++ b/source4/scripting/libjs/samr.js
@@ -1,7 +1,7 @@
 /*
        samr rpc utility functions 
        Copyright Andrew Tridgell 2005
 /*
        samr rpc utility functions 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL v2 or later
+       released under the GNU GPL version 3 or later

 */     
 
 if (global["HAVE_SAMR_JS"] != undefined) {
 */     
 
 if (global["HAVE_SAMR_JS"] != undefined) {

diff --git a/source4/scripting/libjs/server_call.js b/source4/scripting/libjs/server_call.js
index a8c08780f9e66f623279571b22efd8c95846fedc..46414a90ddf61faceab50d0a819ea48f3d483306 100644 (file)
--- a/source4/scripting/libjs/server_call.js
+++ b/source4/scripting/libjs/server_call.js
@@ -2,7 +2,7 @@
        server side js functions for handling async calls from js clients
 
        Copyright Andrew Tridgell 2005
        server side js functions for handling async calls from js clients
 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 
 libinclude("encoder.js");
 */
 
 libinclude("encoder.js");

diff --git a/source4/scripting/libjs/winreg.js b/source4/scripting/libjs/winreg.js
index 29338abc5a318b77a63c2a79cf76359d8fe87712..9db415694dee9f698d8797030a3da14c6fc32d75 100644 (file)
--- a/source4/scripting/libjs/winreg.js
+++ b/source4/scripting/libjs/winreg.js
@@ -1,7 +1,7 @@
 /*
        winreg rpc utility functions 
        Copyright Andrew Tridgell 2005
 /*
        winreg rpc utility functions 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL v2 or later
+       released under the GNU GPL version 3 or later

 */     
 
 libinclude("base.js");
 */     
 
 libinclude("base.js");

diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py
index 3abfbf522e4832ea09fe0b8674b6c88ed523ebb0..ac3d0c3a403add6ea8d7f3a810d86fa221a1ca33 100644 (file)
--- a/source4/scripting/python/subunit/__init__.py
+++ b/source4/scripting/python/subunit/__init__.py
@@ -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
 #
 #  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,
 #  (at your option) any later version.
 #
 #  This program is distributed in the hope that it will be useful,

diff --git a/source4/selftest/test_win.sh b/source4/selftest/test_win.sh
index 960bd20dedf30b428116507e51a5ca0b05aaef19..bc40620af5108300b5c7d2478819f3f6e8d7c16a 100755 (executable)
--- a/source4/selftest/test_win.sh
+++ b/source4/selftest/test_win.sh
@@ -5,7 +5,7 @@
 # run the test,
 # and remove the previously configured directory and share.
 # Copyright Brad Henry <brad@samba.org> 2006
 # run the test,
 # and remove the previously configured directory and share.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 . selftest/test_functions.sh
 
 
 . selftest/test_functions.sh
 

diff --git a/source4/selftest/win/VMHost.pm b/source4/selftest/win/VMHost.pm
index 359d8df3155684cde6dd3760e2ca0b16aef9c69b..1f02f21c284a1f02cf7d0316e34a713c6da0e922 100644 (file)
--- a/source4/selftest/win/VMHost.pm
+++ b/source4/selftest/win/VMHost.pm
@@ -3,7 +3,7 @@
 # A perl object to provide a simple, unified method of handling some
 # VMware Server VM management functions using the perl and VIX API's.
 # Copyright Brad Henry <brad@samba.org> 2006
 # A perl object to provide a simple, unified method of handling some
 # VMware Server VM management functions using the perl and VIX API's.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 # VMware Perl API
 use VMware::VmPerl;
 
 # VMware Perl API
 use VMware::VmPerl;

diff --git a/source4/selftest/win/common.exp b/source4/selftest/win/common.exp
index a7ba95d722550f359e703cd1e47b1bdf65239e7c..28a3d7a6a19183b22a253b8bd9e725025becb8c8 100644 (file)
--- a/source4/selftest/win/common.exp
+++ b/source4/selftest/win/common.exp
@@ -1,6 +1,6 @@
 # A library of commonly used functions written in expect.
 # Copyright Brad Henry <brad@samba.org> 2006
 # A library of commonly used functions written in expect.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 # This function maps a drive letter to a share point.
 proc map_share { remote_prompt share_drive sharepoint username domain password } {
 
 # This function maps a drive letter to a share point.
 proc map_share { remote_prompt share_drive sharepoint username domain password } {

diff --git a/source4/selftest/win/vm_get_ip.pl b/source4/selftest/win/vm_get_ip.pl
index 9286786155b3d4464578e2a67ae3c4e80ce684d5..9657a34790f59e1d6b156dd5579e509827b1becf 100644 (file)
--- a/source4/selftest/win/vm_get_ip.pl
+++ b/source4/selftest/win/vm_get_ip.pl
@@ -2,7 +2,7 @@
 
 # A perl script to connect to a VMware server and get the IP address of a VM.
 # Copyright Brad Henry <brad@samba.org> 2006
 
 # A perl script to connect to a VMware server and get the IP address of a VM.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 use VMHost;
 
 
 use VMHost;
 

diff --git a/source4/selftest/win/vm_load_snapshot.pl b/source4/selftest/win/vm_load_snapshot.pl
index e8ba9b39cfaf2b5aa77316e77269be2d850193a8..35e80badce205ad0379b8b9b5ad5a665ca96c679 100644 (file)
--- a/source4/selftest/win/vm_load_snapshot.pl
+++ b/source4/selftest/win/vm_load_snapshot.pl
@@ -2,7 +2,7 @@
 
 # A perl script to connect to a VMware server and revert a VM snapshot.
 # Copyright Brad Henry <brad@samba.org> 2006
 
 # A perl script to connect to a VMware server and revert a VM snapshot.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 use VMHost;
 
 
 use VMHost;
 

diff --git a/source4/selftest/win/wintest_client.exp b/source4/selftest/win/wintest_client.exp
index 5b45eb2bb035793cf20f492956822dbd815c7c29..ccf5d06ea9ee0c86d4dff1f7663114daf60e2b8b 100644 (file)
--- a/source4/selftest/win/wintest_client.exp
+++ b/source4/selftest/win/wintest_client.exp
@@ -1,7 +1,7 @@
 # An expect script to create a temporary file, map a share, copy the file to the share,
 # and compare the contents of the two files.
 # Copyright Brad Henry <brad@samba.org> 2006
 # An expect script to create a temporary file, map a share, copy the file to the share,
 # and compare the contents of the two files.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 proc run_test { remote_prompt tmp_filename share_drive host_drive buildhost_ip buildhost_share username domain password } {
 
 
 proc run_test { remote_prompt tmp_filename share_drive host_drive buildhost_ip buildhost_share username domain password } {
 

diff --git a/source4/selftest/win/wintest_remove.exp b/source4/selftest/win/wintest_remove.exp
index a361db295832d6820d1725e39076244d0d083990..36dc4a7d24e4a7c1eae7cfd4fca9d297643ddbbc 100644 (file)
--- a/source4/selftest/win/wintest_remove.exp
+++ b/source4/selftest/win/wintest_remove.exp
@@ -1,7 +1,7 @@
 # An expect script to remove a directory and share which was
 # previously setup for an smbtorture test.
 # Copyright Brad Henry <brad@samba.org> 2006
 # An expect script to remove a directory and share which was
 # previously setup for an smbtorture test.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 proc remove_test { remote_prompt sharepath sharename hosts_file_path \
                        backup_hosts_filename } {
 
 proc remove_test { remote_prompt sharepath sharename hosts_file_path \
                        backup_hosts_filename } {

diff --git a/source4/selftest/win/wintest_setup.exp b/source4/selftest/win/wintest_setup.exp
index 1dcbabb4883bf21a5702f625f14a891b52e01b26..f55732ac008e23ccc5ea709d40a39ff8270ba5a4 100644 (file)
--- a/source4/selftest/win/wintest_setup.exp
+++ b/source4/selftest/win/wintest_setup.exp
@@ -1,6 +1,6 @@
 # An expect script to setup a directory and share for an smbtorture test.
 # Copyright Brad Henry <brad@samba.org> 2006
 # An expect script to setup a directory and share for an smbtorture test.
 # Copyright Brad Henry <brad@samba.org> 2006

-# Released under the GNU GPL v2 or later.
+# Released under the GNU GPL version 3 or later.

 
 proc setup_test { remote_prompt sharepath sharename username local_hostname \
                        local_ip hosts_file_path backup_hosts_filename } {
 
 proc setup_test { remote_prompt sharepath sharename username local_hostname \
                        local_ip hosts_file_path backup_hosts_filename } {

diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount
index 0c9937fc44e45e11e3a86f6339cf9bd9d42d3c40..144b6c6494e04949c795c9dd30e5ea11fad95fcf 100644 (file)
--- a/source4/setup/enableaccount
+++ b/source4/setup/enableaccount
@@ -3,7 +3,7 @@
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008

-#      Released under the GNU GPL v2 or later
+#      Released under the GNU GPL version 3 or later

 #
 
 import samba.getopt as options
 #
 
 import samba.getopt as options

diff --git a/source4/setup/newuser b/source4/setup/newuser
index 5f53aad9c6c161b09030949cf74997b5825b79f0..f622058a5d0858ecae21c7ce293f10663242fef3 100755 (executable)
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -3,7 +3,7 @@
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008

-#      Released under the GNU GPL v2 or later
+#      Released under the GNU GPL version 3 or later

 #
 
 import samba.getopt as options
 #
 
 import samba.getopt as options

diff --git a/source4/setup/provision-backend.js b/source4/setup/provision-backend.js
index edc09907a893cbc3e7cd4bf42c13391c32504e0c..9482d8c43503662a8f7a80b25201e48059a3e0a1 100644 (file)
--- a/source4/setup/provision-backend.js
+++ b/source4/setup/provision-backend.js
@@ -3,7 +3,7 @@ exec smbscript "$0" ${1+"$@"}
 /*
        provision a Samba4 server
        Copyright Andrew Tridgell 2005
 /*
        provision a Samba4 server
        Copyright Andrew Tridgell 2005

-       Released under the GNU GPL v2 or later
+       Released under the GNU GPL version 3 or later

 */
 
 options = GetOptions(ARGV,
 */
 
 options = GetOptions(ARGV,

diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index 1c87f4b1c8b8296bcfc337ddc90057e05e2d16ef..31b2f73a256b6078cf3c2efb5de7476f43c1d7c8 100644 (file)
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -3,7 +3,7 @@
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008
 #      add a new user to a Samba4 server
 #      Copyright Andrew Tridgell 2005
 #      Copyright Jelmer Vernooij 2008

-#      Released under the GNU GPL v2 or later
+#      Released under the GNU GPL version 3 or later

 #
 
 import samba.getopt as options
 #
 
 import samba.getopt as options

diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index dc2601d86e6110d4ce99935bdc73f6fa1f024be2..9cfdd805785053ffd40dec2986ec2c7fe2a0fc60 100644 (file)
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/torture/rpc/frsapi.c b/source4/torture/rpc/frsapi.c
index a39c91f853aa09d6b4afd4e35c073a2c19d328d5..c8e421a674980201bd45a6b8835fc9e0d5c77bf8 100644 (file)
--- a/source4/torture/rpc/frsapi.c
+++ b/source4/torture/rpc/frsapi.c
@@ -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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 96db7d1ec509c4ca406fb0c92df1445cac1293c7..32e7b523a4646b254c1e45245e5b5f5ae21f75fc 100644 (file)
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -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
    
    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,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,

diff --git a/swat/scripting/client/call.js b/swat/scripting/client/call.js
index 2886471db2144a3a51236eddf01e333b8d816979..316dec5bb14474ec6f1b157637e34886b03311a6 100644 (file)
--- a/swat/scripting/client/call.js
+++ b/swat/scripting/client/call.js
@@ -2,7 +2,7 @@
        client side js functions for remote calls into the server
 
        Copyright Andrew Tridgell 2005
        client side js functions for remote calls into the server
 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 
 var __call = new Object();
 */
 
 var __call = new Object();

diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js
index 9e1a34293609a156441d05adf991dd82801b8766..8e55cc94ee3a62c90f9e58fca1e1c97f9215f7be 100644 (file)
--- a/swat/scripting/client/desktop.js
+++ b/swat/scripting/client/desktop.js
@@ -2,7 +2,7 @@
    Windows, tabs, and general widgetry for SWAT.
 
    Copyright (C) Deryck Hodge 2005
    Windows, tabs, and general widgetry for SWAT.
 
    Copyright (C) Deryck Hodge 2005

-   released under the GNU GPL Version 2 or later
+   released under the GNU GPL Version 3 or later

 */
 
 /* Qooxdoo's browser sniffer doesn't distinguish IE version.
 */
 
 /* Qooxdoo's browser sniffer doesn't distinguish IE version.

diff --git a/swat/scripting/client/encoder.js b/swat/scripting/client/encoder.js
index 4aa4cc095473d199c52952795d7ad176e4092275..2a4d174b0eecfea697e30f5ef6e39bc7247b0a72 100644 (file)
--- a/swat/scripting/client/encoder.js
+++ b/swat/scripting/client/encoder.js
@@ -2,7 +2,7 @@
        client side js functions for encoding/decoding objects into linear strings
 
        Copyright Andrew Tridgell 2005
        client side js functions for encoding/decoding objects into linear strings
 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 /*
        usage:
 */
 /*
        usage:

diff --git a/swat/scripting/client/js_scripts.js b/swat/scripting/client/js_scripts.js
index 1c6e5806f4cb3929ffb28206277a4a0e88155c29..ea87df02c83cbbb6abdecd3ef14e39fd0f1766c0 100644 (file)
--- a/swat/scripting/client/js_scripts.js
+++ b/swat/scripting/client/js_scripts.js
@@ -2,7 +2,7 @@
    Beginnnigs of a script manager for SWAT.
 
    Copyright (C) Deryck Hodge 2005
    Beginnnigs of a script manager for SWAT.
 
    Copyright (C) Deryck Hodge 2005

-   released under the GNU GPL Version 2 or later
+   released under the GNU GPL Version 3 or later

 */
 
 var head = document.getElementsByTagName('head')[0];
 */
 
 var head = document.getElementsByTagName('head')[0];

diff --git a/swat/scripting/client/regedit.js b/swat/scripting/client/regedit.js
index 9175017c2ef35604370f1c3fbee2cae50c42d3a2..555ba9fb90118074b233c3eefa73458f06b78628 100644 (file)
--- a/swat/scripting/client/regedit.js
+++ b/swat/scripting/client/regedit.js
@@ -2,7 +2,7 @@
        client side js functions for registry editing
 
        Copyright Andrew Tridgell 2005
        client side js functions for registry editing
 
        Copyright Andrew Tridgell 2005

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 
 
 */
 
 

diff --git a/swat/scripting/client/status.js b/swat/scripting/client/status.js
index 31ee31c43b736272feec4ac3ade1e33ffc01f056..a41038d5e963b56413d0a8075b477419bd78726f 100644 (file)
--- a/swat/scripting/client/status.js
+++ b/swat/scripting/client/status.js
@@ -1,7 +1,7 @@
 /*
        server status library for SWAT
 
 /*
        server status library for SWAT
 

-       released under the GNU GPL Version 2 or later
+       released under the GNU GPL Version 3 or later

 */
 
 
 */