Boilerplate: update copyright blurbs on libntlmauth

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 73f5450bc63f19d9d9762b2692e91ef2c41ce53d..46e1821785c7c1d70256eda74e3941d20e5b0a6c 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -98,6 +98,7 @@ Thank you!
     Golub Mikhail
     Gonzalo Arana <gonzalo.arana@gmail.com>
     Graham Keeling <graham@equiinet.com>
+    Guido Serassio <guido.serassio@acmeconsulting.it>
     Guido Serassio <serassio@squid-cache.org>
     Hasso Tepper <hasso@estpak.ee>
     Henrik Nordstr?m <henrik@hlaptop.localdomain>

diff --git a/lib/ntlmauth/Makefile.am b/lib/ntlmauth/Makefile.am
index fbb356bbbfea97fda7895325aabd71852649c698..b260f67047bd456b9d80e578ff6280d5dc4a6369 100644 (file)
--- a/lib/ntlmauth/Makefile.am
+++ b/lib/ntlmauth/Makefile.am
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 

diff --git a/lib/ntlmauth/ntlmauth.cc b/lib/ntlmauth/ntlmauth.cc
index 4d66694eb518cae7000d12ba735aea2bcfccab61..c3ecf0579cc530131ca5ae0bc9fbabc63fece5ad 100644 (file)
--- a/lib/ntlmauth/ntlmauth.cc
+++ b/lib/ntlmauth/ntlmauth.cc
@@ -1,28 +1,18 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * AUTHOR: Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
  * AUTHOR: Guido Serassio: <guido.serassio@acmeconsulting.it>
  * AUTHOR: Amos Jeffries <squid3@treenet.co.nz>
  *
- * * * * * * * * Legal stuff * * * * * * *
- *
- * (C) 2000 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>,
- *   inspired by previous work by Andrew Doran <ad@interlude.eu.org>.
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
+ * Inspired by previous work by Andrew Doran <ad@interlude.eu.org>.
  */
-
 #include "squid.h"
 
 #include <cstring>

diff --git a/lib/ntlmauth/ntlmauth.h b/lib/ntlmauth/ntlmauth.h
index 0b389daf5eb688f4edb95954390a971633a5f57d..c3f0f89762e736ec375741d5093a9afaecabb4cc 100644 (file)
--- a/lib/ntlmauth/ntlmauth.h
+++ b/lib/ntlmauth/ntlmauth.h
@@ -1,53 +1,9 @@
 /*
- * * * * * * * * Legal stuff * * * * * * *
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
  *
- * (C) 2000 Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>,
- *   inspired by previous work by Andrew Doran <ad@interlude.eu.org>.
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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
- *
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * * * * * * * * Declaration of intents * * * * * * *
- *
- * This header contains definitions and defines allowing to decode and
- * understand NTLM packets, as sent by Internet Explorer.
- * It's put here as it is a common utility to all HTLM-enabled modules.
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_NTLMAUTH_H

diff --git a/lib/ntlmauth/support_bits.cci b/lib/ntlmauth/support_bits.cci
index c59695a8887fbeb6fe30deb3f41d5a1cd4aaf079..d4fbcc10fbfdbc691f95d13e65ebb0dfd0171f2d 100644 (file)
--- a/lib/ntlmauth/support_bits.cci
+++ b/lib/ntlmauth/support_bits.cci
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #ifndef SQUID_LIBNTLMAUTH_SUPPORT_BITS_CCI
 #define SQUID_LIBNTLMAUTH_SUPPORT_BITS_CCI