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

70 files changed, 70 insertions, 140 deletions

diff --git a/source/include/MacExtensions.h b/source/include/MacExtensions.h
index d1f538e137a..006b814037c 100644
--- a/source/include/MacExtensions.h
+++ b/source/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/source/include/ads_cldap.h b/source/include/ads_cldap.h
index 135e324e3bd..692fc1b2338 100644
--- a/source/include/ads_cldap.h
+++ b/source/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/source/include/asn_1.h b/source/include/asn_1.h
index 9d8f0904f9b..152662ccbf8 100644
--- a/source/include/asn_1.h
+++ b/source/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/source/include/auth.h b/source/include/auth.h
index 1a202a38286..a58d150c51d 100644
--- a/source/include/auth.h
+++ b/source/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/source/include/authdata.h b/source/include/authdata.h
index 2bb1936f48c..8125f05639a 100644
--- a/source/include/authdata.h
+++ b/source/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/source/include/byteorder.h b/source/include/byteorder.h
index 9b0ef98ce40..32138a89ce5 100644
--- a/source/include/byteorder.h
+++ b/source/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/source/include/charset.h b/source/include/charset.h
index 9b35736ea93..4d04b5a1a67 100644
--- a/source/include/charset.h
+++ b/source/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/source/include/client.h b/source/include/client.h
index fc28e4e82c4..f8f65044427 100644
--- a/source/include/client.h
+++ b/source/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/source/include/ctdbd_conn.h b/source/include/ctdbd_conn.h
index 1c38fcafad1..eecc100ee6b 100644
--- a/source/include/ctdbd_conn.h
+++ b/source/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/source/include/dbwrap.h b/source/include/dbwrap.h
index b98e1646ced..57378354b55 100644
--- a/source/include/dbwrap.h
+++ b/source/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/source/include/debug.h b/source/include/debug.h
index 4ad471f1423..c976268c59e 100644
--- a/source/include/debug.h
+++ b/source/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/source/include/dlinklist.h b/source/include/dlinklist.h
index 7620364c842..1a4ebb6fa09 100644
--- a/source/include/dlinklist.h
+++ b/source/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/source/include/doserr.h b/source/include/doserr.h
index adc8e41f895..2f2861ae4a7 100644
--- a/source/include/doserr.h
+++ b/source/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/source/include/dynconfig.h b/source/include/dynconfig.h
index ea33a81cbb1..7091aa81b56 100644
--- a/source/include/dynconfig.h
+++ b/source/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/source/include/event.h b/source/include/event.h
index 293bc779a60..0465fae471f 100644
--- a/source/include/event.h
+++ b/source/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/source/include/fake_file.h b/source/include/fake_file.h
index 9ba7e5de921..d8a53894c64 100644
--- a/source/include/fake_file.h
+++ b/source/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/source/include/hmacmd5.h b/source/include/hmacmd5.h
index 65987bc37ec..ae588fb889a 100644
--- a/source/include/hmacmd5.h
+++ b/source/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/source/include/includes.h b/source/include/includes.h
index f60d0895b1f..1a930f8f9ba 100644
--- a/source/include/includes.h
+++ b/source/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/source/include/intl.h b/source/include/intl.h
index 8e83e42fc71..cb0dc346cc4 100644
--- a/source/include/intl.h
+++ b/source/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/source/include/locking.h b/source/include/locking.h
index aea976bf9c5..35d9f484670 100644
--- a/source/include/locking.h
+++ b/source/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/source/include/messages.h b/source/include/messages.h
index 6aa7d41d423..ddf0aa91724 100644
--- a/source/include/messages.h
+++ b/source/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/source/include/module.h b/source/include/module.h
index 4c31b572248..20dbaba6b40 100644
--- a/source/include/module.h
+++ b/source/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/source/include/msdfs.h b/source/include/msdfs.h
index ef9dd78afe9..f78f76ba27f 100644
--- a/source/include/msdfs.h
+++ b/source/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/source/include/nameserv.h b/source/include/nameserv.h
index aeeaf89f7a0..46ea68574e7 100644
--- a/source/include/nameserv.h
+++ b/source/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/source/include/nt_printing.h b/source/include/nt_printing.h
index d8157141a2d..968e63d8e2e 100644
--- a/source/include/nt_printing.h
+++ b/source/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/source/include/nt_status.h b/source/include/nt_status.h
index 990ca6466d1..87de48edbe4 100644
--- a/source/include/nt_status.h
+++ b/source/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/source/include/ntdomain.h b/source/include/ntdomain.h
index 2c63ac79f81..f1f9dcec4f5 100644
--- a/source/include/ntdomain.h
+++ b/source/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/source/include/nterr.h b/source/include/nterr.h
index dd90d91d7f1..da9fab3aca2 100644
--- a/source/include/nterr.h
+++ b/source/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/source/include/ntioctl.h b/source/include/ntioctl.h
index 743d805e83e..2bf9211a1e7 100644
--- a/source/include/ntioctl.h
+++ b/source/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/source/include/ntlmssp.h b/source/include/ntlmssp.h
index a4ae5610bef..fe38bd35681 100644
--- a/source/include/ntlmssp.h
+++ b/source/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/source/include/ntquotas.h b/source/include/ntquotas.h
index 137f3a1381d..12ff1788e8e 100644
--- a/source/include/ntquotas.h
+++ b/source/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/source/include/packet.h b/source/include/packet.h
index b60ab80d72b..71a7cd36da2 100644
--- a/source/include/packet.h
+++ b/source/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/source/include/passdb.h b/source/include/passdb.h
index effbd605ce8..60e8a63f908 100644
--- a/source/include/passdb.h
+++ b/source/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/source/include/popt_common.h b/source/include/popt_common.h
index 0d940f3ebaf..9944610c62e 100644
--- a/source/include/popt_common.h
+++ b/source/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/source/include/printing.h b/source/include/printing.h
index 407e6a1ae5b..4cd2ea6149e 100644
--- a/source/include/printing.h
+++ b/source/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/source/include/privileges.h b/source/include/privileges.h
index e9579f94607..b579bd0cb25 100644
--- a/source/include/privileges.h
+++ b/source/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/source/include/pstring.h b/source/include/pstring.h
index 61da6b3bd4c..cf06ad84719 100644
--- a/source/include/pstring.h
+++ b/source/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/source/include/rap.h b/source/include/rap.h
index 33b3cef7a1a..a7efb67d608 100755
--- a/source/include/rap.h
+++ b/source/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/source/include/reg_db.h b/source/include/reg_db.h
index 2c55c38c72a..92448ae5437 100644
--- a/source/include/reg_db.h
+++ b/source/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/source/include/reg_objects.h b/source/include/reg_objects.h
index 71ae24aff7f..7a5d82cee9b 100644
--- a/source/include/reg_objects.h
+++ b/source/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/source/include/rpc_brs.h b/source/include/rpc_brs.h
index 1a078c686d9..62ee86050fb 100644
--- a/source/include/rpc_brs.h
+++ b/source/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/source/include/rpc_client.h b/source/include/rpc_client.h
index 444c124a978..95aeffdcb9d 100644
--- a/source/include/rpc_client.h
+++ b/source/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/source/include/rpc_dce.h b/source/include/rpc_dce.h
index 17ca2e82f83..7ea3fcbc233 100644
--- a/source/include/rpc_dce.h
+++ b/source/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/source/include/rpc_ds.h b/source/include/rpc_ds.h
index 6701b68bfae..1ba02aede0a 100644
--- a/source/include/rpc_ds.h
+++ b/source/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/source/include/rpc_lsa.h b/source/include/rpc_lsa.h
index 534fc1ac0a9..9f90b53ffab 100644
--- a/source/include/rpc_lsa.h
+++ b/source/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/source/include/rpc_misc.h b/source/include/rpc_misc.h
index 552aa95caf3..e50a52fea2f 100644
--- a/source/include/rpc_misc.h
+++ b/source/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/source/include/rpc_netlogon.h b/source/include/rpc_netlogon.h
index 90399063e67..acd33227843 100644
--- a/source/include/rpc_netlogon.h
+++ b/source/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/source/include/rpc_ntsvcs.h b/source/include/rpc_ntsvcs.h
index 6a4e198dc39..045d9b4e925 100644
--- a/source/include/rpc_ntsvcs.h
+++ b/source/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/source/include/rpc_samr.h b/source/include/rpc_samr.h
index c8cd2390b62..368ebbbc5b7 100644
--- a/source/include/rpc_samr.h
+++ b/source/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/source/include/rpc_secdes.h b/source/include/rpc_secdes.h
index 24074ccde1b..1c49e4242da 100644
--- a/source/include/rpc_secdes.h
+++ b/source/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/source/include/rpc_spoolss.h b/source/include/rpc_spoolss.h
index 56d1cbfb4c8..aff0bba4445 100755
--- a/source/include/rpc_spoolss.h
+++ b/source/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/source/include/rpc_svcctl.h b/source/include/rpc_svcctl.h
index 79b940f77bc..e212904070c 100644
--- a/source/include/rpc_svcctl.h
+++ b/source/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/source/include/safe_string.h b/source/include/safe_string.h
index 2467a0ef276..68be38df75a 100644
--- a/source/include/safe_string.h
+++ b/source/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/source/include/samba_linux_quota.h b/source/include/samba_linux_quota.h
index e7661acc33f..8dbbec237f3 100644
--- a/source/include/samba_linux_quota.h
+++ b/source/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/source/include/session.h b/source/include/session.h
index 9c66ea90590..1f5c1a85703 100644
--- a/source/include/session.h
+++ b/source/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/source/include/smb.h b/source/include/smb.h
index c099e2a4d5c..9db97243eae 100644
--- a/source/include/smb.h
+++ b/source/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/source/include/smb_acls.h b/source/include/smb_acls.h
index 2e8ee2630f1..3d9cfbf5d20 100644
--- a/source/include/smb_acls.h
+++ b/source/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/source/include/smb_launchd.h b/source/include/smb_launchd.h
index 4093afb2bc6..dcbe43ce711 100644
--- a/source/include/smb_launchd.h
+++ b/source/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/source/include/smb_ldap.h b/source/include/smb_ldap.h
index 5bd7050422a..8fb3015094b 100644
--- a/source/include/smb_ldap.h
+++ b/source/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/source/include/smb_macros.h b/source/include/smb_macros.h
index 51db8ea1784..3221d2f951d 100644
--- a/source/include/smb_macros.h
+++ b/source/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/source/include/smbldap.h b/source/include/smbldap.h
index 54807d2c279..bc438a98de4 100644
--- a/source/include/smbldap.h
+++ b/source/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/source/include/smbprofile.h b/source/include/smbprofile.h
index 1635f913a7b..2c25a69601d 100644
--- a/source/include/smbprofile.h
+++ b/source/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/source/include/spnego.h b/source/include/spnego.h
index 5c75bc5e557..02921ed18e3 100644
--- a/source/include/spnego.h
+++ b/source/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/source/include/srvstr.h b/source/include/srvstr.h
index 98b119e7cc3..c1bb5226e5c 100644
--- a/source/include/srvstr.h
+++ b/source/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/source/include/trans2.h b/source/include/trans2.h
index d4c0e89e383..5cc50b193cc 100644
--- a/source/include/trans2.h
+++ b/source/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/source/include/util_getent.h b/source/include/util_getent.h
index 2cccc2560cc..c260e70f459 100644
--- a/source/include/util_getent.h
+++ b/source/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/source/include/util_tdb.h b/source/include/util_tdb.h
index 4760e4cd975..cb128422d5e 100644
--- a/source/include/util_tdb.h
+++ b/source/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/source/include/vfs.h b/source/include/vfs.h
index fdba306c1fc..b136750e7c4 100644
--- a/source/include/vfs.h
+++ b/source/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/source/include/vfs_macros.h b/source/include/vfs_macros.h
index a398dbd39cf..9957b585de6 100644
--- a/source/include/vfs_macros.h
+++ b/source/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/source/include/xfile.h b/source/include/xfile.h
index a2dc7d7132f..ffe4481a647 100644
--- a/source/include/xfile.h
+++ b/source/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_