r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text

(This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07)

70 files changed, 70 insertions, 140 deletions

diff --git a/source3/include/MacExtensions.h b/source3/include/MacExtensions.h
index d1f538e137..006b814037 100644
--- a/source3/include/MacExtensions.h
+++ b/source3/include/MacExtensions.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef _MAC_EXTENSIONS_H
 #define _MAC_EXTENSIONS_H
diff --git a/source3/include/ads_cldap.h b/source3/include/ads_cldap.h
index 135e324e3b..692fc1b233 100644
--- a/source3/include/ads_cldap.h
+++ b/source3/include/ads_cldap.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  
 */
 
 #ifndef _INCLUDE_ADS_CLDAP_H_
diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h
index 9d8f0904f9..152662ccbf 100644
--- a/source3/include/asn_1.h
+++ b/source3/include/asn_1.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _ASN_1_H
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 1a202a3828..a58d150c51 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 typedef struct auth_usersupplied_info {
diff --git a/source3/include/authdata.h b/source3/include/authdata.h
index 2bb1936f48..8125f05639 100644
--- a/source3/include/authdata.h
+++ b/source3/include/authdata.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _AUTHDATA_H
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index 9b0ef98ce4..32138a89ce 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _BYTEORDER_H
diff --git a/source3/include/charset.h b/source3/include/charset.h
index 9b35736ea9..4d04b5a1a6 100644
--- a/source3/include/charset.h
+++ b/source3/include/charset.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* this defines the charset types used in samba */
diff --git a/source3/include/client.h b/source3/include/client.h
index fc28e4e82c..f8f6504442 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _CLIENT_H
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 1c38fcafad..eecc100ee6 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 struct ctdbd_connection;
diff --git a/source3/include/dbwrap.h b/source3/include/dbwrap.h
index b98e1646ce..57378354b5 100644
--- a/source3/include/dbwrap.h
+++ b/source3/include/dbwrap.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __FILEDB_H__
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 4ad471f142..c976268c59 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _DEBUG_H
diff --git a/source3/include/dlinklist.h b/source3/include/dlinklist.h
index 7620364c84..1a4ebb6fa0 100644
--- a/source3/include/dlinklist.h
+++ b/source3/include/dlinklist.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* To use these macros you must have a structure containing a next and
diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index adc8e41f89..2f2861ae4a 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _DOSERR_H
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h
index ea33a81cbb..7091aa81b5 100644
--- a/source3/include/dynconfig.h
+++ b/source3/include/dynconfig.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**
diff --git a/source3/include/event.h b/source3/include/event.h
index 293bc779a6..0465fae471 100644
--- a/source3/include/event.h
+++ b/source3/include/event.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* bits for file descriptor event flags */
diff --git a/source3/include/fake_file.h b/source3/include/fake_file.h
index 9ba7e5de92..d8a53894c6 100644
--- a/source3/include/fake_file.h
+++ b/source3/include/fake_file.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _FAKE_FILE_H
diff --git a/source3/include/hmacmd5.h b/source3/include/hmacmd5.h
index 65987bc37e..ae588fb889 100644
--- a/source3/include/hmacmd5.h
+++ b/source3/include/hmacmd5.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _HMAC_MD5_H
diff --git a/source3/include/includes.h b/source3/include/includes.h
index f60d0895b1..1a930f8f9b 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* work around broken krb5.h on sles9 */
diff --git a/source3/include/intl.h b/source3/include/intl.h
index 8e83e42fc7..cb0dc346cc 100644
--- a/source3/include/intl.h
+++ b/source3/include/intl.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
diff --git a/source3/include/locking.h b/source3/include/locking.h
index aea976bf9c..35d9f48467 100644
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _LOCKING_H
diff --git a/source3/include/messages.h b/source3/include/messages.h
index 6aa7d41d42..ddf0aa9172 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _MESSAGES_H_
diff --git a/source3/include/module.h b/source3/include/module.h
index 4c31b57224..20dbaba6b4 100644
--- a/source3/include/module.h
+++ b/source3/include/module.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _MODULE_H
diff --git a/source3/include/msdfs.h b/source3/include/msdfs.h
index ef9dd78afe..f78f76ba27 100644
--- a/source3/include/msdfs.h
+++ b/source3/include/msdfs.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index aeeaf89f7a..46ea68574e 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index d8157141a2..968e63d8e2 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef NT_PRINTING_H_
diff --git a/source3/include/nt_status.h b/source3/include/nt_status.h
index 990ca6466d..87de48edbe 100644
--- a/source3/include/nt_status.h
+++ b/source3/include/nt_status.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _NT_STATUS_H
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 2c63ac79f8..f1f9dcec4f 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _NT_DOMAIN_H /* _NT_DOMAIN_H */
diff --git a/source3/include/nterr.h b/source3/include/nterr.h
index dd90d91d7f..da9fab3aca 100644
--- a/source3/include/nterr.h
+++ b/source3/include/nterr.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _NTERR_H
diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 743d805e83..2bf9211a1e 100644
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index a4ae5610be..fe38bd3568 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* NTLMSSP mode */
diff --git a/source3/include/ntquotas.h b/source3/include/ntquotas.h
index 137f3a1381..12ff1788e8 100644
--- a/source3/include/ntquotas.h
+++ b/source3/include/ntquotas.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _NTQUOTAS_H
diff --git a/source3/include/packet.h b/source3/include/packet.h
index b60ab80d72..71a7cd36da 100644
--- a/source3/include/packet.h
+++ b/source3/include/packet.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index effbd605ce..60e8a63f90 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _PASSDB_H
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index 0d940f3eba..9944610c62 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _POPT_COMMON_H
diff --git a/source3/include/printing.h b/source3/include/printing.h
index 407e6a1ae5..4cd2ea6149 100644
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
diff --git a/source3/include/privileges.h b/source3/include/privileges.h
index e9579f9460..b579bd0cb2 100644
--- a/source3/include/privileges.h
+++ b/source3/include/privileges.h
@@ -19,8 +19,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PRIVILEGES_H
diff --git a/source3/include/pstring.h b/source3/include/pstring.h
index 61da6b3bd4..cf06ad8471 100644
--- a/source3/include/pstring.h
+++ b/source3/include/pstring.h
@@ -19,8 +19,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _PSTRING
diff --git a/source3/include/rap.h b/source3/include/rap.h
index 33b3cef7a1..a7efb67d60 100755
--- a/source3/include/rap.h
+++ b/source3/include/rap.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RAP_H_
diff --git a/source3/include/reg_db.h b/source3/include/reg_db.h
index 2c55c38c72..92448ae543 100644
--- a/source3/include/reg_db.h
+++ b/source3/include/reg_db.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _REG_DB_H
diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
index 71ae24aff7..7a5d82cee9 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _REG_OBJECTS_H /* _REG_OBJECTS_H */
diff --git a/source3/include/rpc_brs.h b/source3/include/rpc_brs.h
index 1a078c686d..62ee86050f 100644
--- a/source3/include/rpc_brs.h
+++ b/source3/include/rpc_brs.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_BRS_H /* _RPC_BRS_H */
diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 444c124a97..95aeffdcb9 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_CLIENT_H
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 17ca2e82f8..7ea3fcbc23 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -16,8 +16,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _DCE_RPC_H /* _DCE_RPC_H */
diff --git a/source3/include/rpc_ds.h b/source3/include/rpc_ds.h
index 6701b68bfa..1ba02aede0 100644
--- a/source3/include/rpc_ds.h
+++ b/source3/include/rpc_ds.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_DS_H /* _RPC_LSA_H */
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 534fc1ac0a..9f90b53ffa 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_LSA_H /* _RPC_LSA_H */
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index 552aa95caf..e50a52fea2 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_MISC_H /* _RPC_MISC_H */
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 90399063e6..acd3322784 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_NETLOGON_H /* _RPC_NETLOGON_H */
diff --git a/source3/include/rpc_ntsvcs.h b/source3/include/rpc_ntsvcs.h
index 6a4e198dc3..045d9b4e92 100644
--- a/source3/include/rpc_ntsvcs.h
+++ b/source3/include/rpc_ntsvcs.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_NTSVCS_H /* _RPC_NTSVCS_H */
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index c8cd2390b6..368ebbbc5b 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/include/rpc_samr.h
@@ -19,8 +19,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_SAMR_H /* _RPC_SAMR_H */
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 24074ccde1..1c49e4242d 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_SECDES_H /* _RPC_SECDES_H */
diff --git a/source3/include/rpc_spoolss.h b/source3/include/rpc_spoolss.h
index 56d1cbfb4c..aff0bba444 100755
--- a/source3/include/rpc_spoolss.h
+++ b/source3/include/rpc_spoolss.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_SPOOLSS_H		/* _RPC_SPOOLSS_H */
diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 79b940f77b..e212904070 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _RPC_SVCCTL_H /* _RPC_SVCCTL_H */
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h
index 2467a0ef27..68be38df75 100644
--- a/source3/include/safe_string.h
+++ b/source3/include/safe_string.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SAFE_STRING_H
diff --git a/source3/include/samba_linux_quota.h b/source3/include/samba_linux_quota.h
index e7661acc33..8dbbec237f 100644
--- a/source3/include/samba_linux_quota.h
+++ b/source3/include/samba_linux_quota.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
diff --git a/source3/include/session.h b/source3/include/session.h
index 9c66ea9059..1f5c1a8570 100644
--- a/source3/include/session.h
+++ b/source3/include/session.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* a "session" is claimed when we do a SessionSetupX operation
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c099e2a4d5..9db97243ea 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -20,8 +20,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SMB_H
diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h
index 2e8ee2630f..3d9cfbf5d2 100644
--- a/source3/include/smb_acls.h
+++ b/source3/include/smb_acls.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SMB_ACLS_H
diff --git a/source3/include/smb_launchd.h b/source3/include/smb_launchd.h
index 4093afb2bc..dcbe43ce71 100644
--- a/source3/include/smb_launchd.h
+++ b/source3/include/smb_launchd.h
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 struct smb_launch_info
diff --git a/source3/include/smb_ldap.h b/source3/include/smb_ldap.h
index 5bd7050422..8fb3015094 100644
--- a/source3/include/smb_ldap.h
+++ b/source3/include/smb_ldap.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 51db8ea178..3221d2f951 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SMB_MACROS_H
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 54807d2c27..bc438a98de 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
    
 */
 
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 1635f913a7..2c25a69601 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
diff --git a/source3/include/spnego.h b/source3/include/spnego.h
index 5c75bc5e55..02921ed18e 100644
--- a/source3/include/spnego.h
+++ b/source3/include/spnego.h
@@ -17,8 +17,7 @@
 
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SAMBA_SPNEGO_H
diff --git a/source3/include/srvstr.h b/source3/include/srvstr.h
index 98b119e7cc..c1bb5226e5 100644
--- a/source3/include/srvstr.h
+++ b/source3/include/srvstr.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define srvstr_pull(base_ptr, smb_flags2, dest, src, dest_len, src_len, flags) \
diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index d4c0e89e38..5cc50b193c 100644
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _TRANS2_H_
diff --git a/source3/include/util_getent.h b/source3/include/util_getent.h
index 2cccc2560c..c260e70f45 100644
--- a/source3/include/util_getent.h
+++ b/source3/include/util_getent.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _UTIL_GETENT_H
diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 4760e4cd97..cb128422d5 100644
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __TDBUTIL_H__
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index fdba306c1f..b136750e7c 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
    This work was sponsored by Optifacio Software Services, Inc.
 */
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index a398dbd39c..9957b585de 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _VFS_MACROS_H
diff --git a/source3/include/xfile.h b/source3/include/xfile.h
index a2dc7d7132..ffe4481a64 100644
--- a/source3/include/xfile.h
+++ b/source3/include/xfile.h
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _XFILE_H_