Boilerplate: update copyright blurbs on lib/snmplib

* Add Squid Software Foundation blurbs

* update CREDITS to meet Carnegie Mellon license requirements

diff --git a/CREDITS b/CREDITS
index e2b880b0b5554e11d44d27cb4d9a27950a24fbdd..ea518b2cd5b65dcb83e924519431959ab6dc109c 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -654,7 +654,15 @@ include/snmp_msg.h,
 include/snmp_pdu.h,
 include/snmp_session.h,
 include/snmp_vars.h,
-include/snmp.h:
+include/snmp.h,
+lib/snmplib/asn1.c,
+lib/snmplib/coexistence.c,
+lib/snmplib/snmp_api.c,
+lib/snmplib/snmp_api_error.c,
+lib/snmplib/snmp_error.c,
+lib/snmplib/snmp_msg.c,
+lib/snmplib/snmp_pdu.c,
+lib/snmplib/snmp_vars.c,
 
  *           Copyright 1997 by Carnegie Mellon University
  *
@@ -695,7 +703,8 @@ lib/md5.c:
 ==============================================================================
 
 include/parse.h,
-include/snmp_api.h:
+include/snmp_api.h,
+lib/snmplib/parse.c
 
 /***********************************************************
         Copyright 1989 by Carnegie Mellon University
@@ -762,7 +771,8 @@ include/rfc2617.h:
 ==============================================================================
 
 include/snmp_client.h,
-include/snmp_impl.h:
+include/snmp_impl.h,
+lib/snmplib/mib.c,
 
 /***********************************************************
         Copyright 1988, 1989 by Carnegie Mellon University
@@ -823,36 +833,6 @@ Modified to work with strings instead of files.
 
 ==============================================================================
 
-lib/snmplib/*:
-
-The SNMP library code is developed by Carnegie Mellon University.
-
-/***************************************************************************
- *
- *           Copyright 1997 by Carnegie Mellon University
- * 
- *                       All Rights Reserved
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of CMU not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * 
- * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * 
- ***************************************************************************/
-
-==============================================================================
-
 lib/drand48.c:
 
 From Linux libc-5.4.46.

diff --git a/lib/snmplib/Makefile.am b/lib/snmplib/Makefile.am
index d00bcee3802d0725d7ca02957410f5428edb5c47..e354bd42f25db1382b1f48c6d193ffbb44b72aa9 100644 (file)
--- a/lib/snmplib/Makefile.am
+++ b/lib/snmplib/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.
+##
+
 ## Process this file with automake to produce Makefile.in
 ##
 ## Makefile for libsnmp.

diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c
index 34fc659cad160c1cde2fa522e2c0de706c5582b2..6dd638dffa25719b4ff529095fc1fceb11ab111b 100644 (file)
--- a/lib/snmplib/asn1.c
+++ b/lib/snmplib/asn1.c
@@ -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.
+ */
+
 /*
  * Abstract Syntax Notation One, ASN.1
  * As defined in ISO/IS 8824 and ISO/IS 8825

diff --git a/lib/snmplib/coexistance.c b/lib/snmplib/coexistance.c
index 9fab1a7a7378cca8aaae8d47933785ee8d49e4ae..914fbdc24a5b150a4d5e65d8bfb73334ccce7430 100644 (file)
--- a/lib/snmplib/coexistance.c
+++ b/lib/snmplib/coexistance.c
@@ -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.
+ */
+
 /*
  * RFC 1908: Coexistence between SNMPv1 and SNMPv2
  */

diff --git a/lib/snmplib/mib.c b/lib/snmplib/mib.c
index 0eba06a713530f0624a4512756258e1ef97c1152..14cd25bf3dfe2ac5a071f66405f190f63acdc447 100644 (file)
--- a/lib/snmplib/mib.c
+++ b/lib/snmplib/mib.c
@@ -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.
+ */
 
 /***********************************************************
        Copyright 1988, 1989 by Carnegie Mellon University

diff --git a/lib/snmplib/parse.c b/lib/snmplib/parse.c
index fad5a8d5445980b1f239d1e0c7d9abde6ebec31c..5a1aea8b1aceaf999dc5f38b83589121ba6cdc51 100644 (file)
--- a/lib/snmplib/parse.c
+++ b/lib/snmplib/parse.c
@@ -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.
+ */
+
 /***********************************************************
        Copyright 1989 by Carnegie Mellon University
 
@@ -20,9 +28,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 ******************************************************************/
 
-/*
- * parse.c
- */
 #include "squid.h"
 #include "asn1.h"
 #include "cache_snmp.h"

diff --git a/lib/snmplib/snmp_api.c b/lib/snmplib/snmp_api.c
index c5ddbc7ba691b4692a3f242c42b8f3e8cae3dfb9..4813767ae76e42057475ccea05a0b0b1d907c847 100644 (file)
--- a/lib/snmplib/snmp_api.c
+++ b/lib/snmplib/snmp_api.c
@@ -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.
+ */
 
 /**********************************************************************
  *

diff --git a/lib/snmplib/snmp_api_error.c b/lib/snmplib/snmp_api_error.c
index bebf939ed1482e38422aeb3d83c37d99604b8a0b..06001e2d9f157896889dd5fd50ea4c4c5778b9a6 100644 (file)
--- a/lib/snmplib/snmp_api_error.c
+++ b/lib/snmplib/snmp_api_error.c
@@ -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.
+ */
+
 /*
  * Error routines concerning the error status of the SNMP API.
  *
@@ -33,10 +41,6 @@
 #include "squid.h"
 #include "snmp_api_error.h"
 
-/***************************************************************************
- *
- ***************************************************************************/
-
 int snmp_errno = 0;
 
 static const char *api_errors[17] = {

diff --git a/lib/snmplib/snmp_error.c b/lib/snmplib/snmp_error.c
index 1af437b5eb648e6a125dc048f46089d3259b91fb..6b61b1c745f85bc66bd8466e00ca69bc72f0d5c7 100644 (file)
--- a/lib/snmplib/snmp_error.c
+++ b/lib/snmplib/snmp_error.c
@@ -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.
+ */
+
 /*
  * The possible SNMP Error messages, from the SNMP Protocol Operations
  * [ RFC 1905 ]

diff --git a/lib/snmplib/snmp_msg.c b/lib/snmplib/snmp_msg.c
index 04c98aebc4adc3a1671e3f41a99810584b61ff94..e084cfb3ea4a491f70a6236d2811ea8b75a57951 100644 (file)
--- a/lib/snmplib/snmp_msg.c
+++ b/lib/snmplib/snmp_msg.c
@@ -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.
+ */
+
 /*
  * SNMP Message Encoding Routines
  *

diff --git a/lib/snmplib/snmp_pdu.c b/lib/snmplib/snmp_pdu.c
index 4b783c4e65c01a2c633abc1a983b34a5447a689b..b10ff0a1830c1b22fdfe7464c18d1ce7847511dd 100644 (file)
--- a/lib/snmplib/snmp_pdu.c
+++ b/lib/snmplib/snmp_pdu.c
@@ -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.
+ */
+
 /*
  * SNMP PDU Encoding
  *

diff --git a/lib/snmplib/snmp_vars.c b/lib/snmplib/snmp_vars.c
index 6413ed571e97b23e0a9e45624e82bd458d4c2853..5f068087d401d1d0e8fa76f6c0dee6dbcf9a74ce 100644 (file)
--- a/lib/snmplib/snmp_vars.c
+++ b/lib/snmplib/snmp_vars.c
@@ -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.
+ */
 
 /*
  * SNMP Variable Binding.  Complies with:

diff --git a/lib/snmplib/snmplib_debug.c b/lib/snmplib/snmplib_debug.c
index 809e19b21fbe7d628cc1b647345b28e4c2c07ee7..7be554af222c974959c6d6ca63021ae5e5492f1f 100644 (file)
--- a/lib/snmplib/snmplib_debug.c
+++ b/lib/snmplib/snmplib_debug.c
@@ -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.
+ */
+
 #include "squid.h"
 
 #if HAVE_SYS_TYPES_H