Boilerplate: update copyright blurbs on lib/librfcnb

* Add Squid Software Foundation blurb

* Update CONTRIBUTORS with missing authors

* Update CREDITS with missing license blurb

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 46e1821785c7c1d70256eda74e3941d20e5b0a6c..1622c39c284c6a0549ae7d815f05bc3e4a3d7c17 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -26,6 +26,7 @@ Thank you!
     Andrew Beverley <andy@andybev.com>
     Andrew Hoying <andrew_hoying@blm.gov>
     Andrey Shorin <tolsty@tushino.com>
+    Andrew Tridgell
     Anonymous <redskilldough@gmail.com>
     Ansgar Hockmann <Ansgar.Hockmann@hrz.uni-dortmund.de>
     Anthony Baxter <arb@connect.com.au>
@@ -210,6 +211,7 @@ Thank you!
     Rene Geile <rene.geile@t-online.de>
     Reuben Farrelly <reuben@reub.net>
     Richard Huveneers <Richard.Huveneers@hekkihek.hacom.nl>
+    Richard Sharpe
     Richard Wall <richard.wall@appliansys.com>
     Robert Collins <rbtcollins@hotmail.com>
     Robert Collins <robertc@robertcollins.net>

diff --git a/CREDITS b/CREDITS
index 6e9aac010e6b54c8e8a1fa2d564e4be395802015..cd6b685a57ba4de67c7c3adf85e2fdfc7543076f 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -794,6 +794,24 @@ include/snmp_util.h:
 
 ==============================================================================
 
+lib/rfcnb/:
+
+ * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+==============================================================================
+
 lib/base64.c::base64_encode():
 
 Adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c.

diff --git a/lib/rfcnb/Makefile.am b/lib/rfcnb/Makefile.am
index b3711703c6c2a0057326fdbc87ebf619074a5df6..4b24ac359584a3c5ac16643150cd62b99b5e1d39 100644 (file)
--- a/lib/rfcnb/Makefile.am
+++ b/lib/rfcnb/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
 
 AM_CPPFLAGS += -I$(top_srcdir)/lib

diff --git a/lib/rfcnb/byteorder.h b/lib/rfcnb/byteorder.h
index d8ddd8ea6d2884e1438cf8011a1be227223e6862..dbf72a6152874be3fc0e74ff7f1e51f06ea81991 100644 (file)
--- a/lib/rfcnb/byteorder.h
+++ b/lib/rfcnb/byteorder.h
@@ -1,9 +1,19 @@
+/*
+ * 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.
+ */
+
 /*
  * Unix SMB/Netbios implementation.
  * Version 1.9.
  * SMB Byte handling
  * Copyright (C) Andrew Tridgell 1992-1995
- *
+ */
+
+/*
  * 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

diff --git a/lib/rfcnb/rfcnb-common.h b/lib/rfcnb/rfcnb-common.h
index 1ab2be37e6d4133f5c3691ab2dc8a1aa30b8b4dd..57634b351b4461b4d32335da99d04a346eda6a04 100644 (file)
--- a/lib/rfcnb/rfcnb-common.h
+++ b/lib/rfcnb/rfcnb-common.h
@@ -1,10 +1,17 @@
+/*
+ * 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.
+ */
+
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
  * Version 1.0
  * RFCNB Common Structures etc Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*

diff --git a/lib/rfcnb/rfcnb-error.h b/lib/rfcnb/rfcnb-error.h
index 3432fc63e4a6fc50b11d655bb2ccea0dbb7e3f99..a9c4dd3f43beb6c523f6ad99bebb4b9e5990787d 100644 (file)
--- a/lib/rfcnb/rfcnb-error.h
+++ b/lib/rfcnb/rfcnb-error.h
@@ -1,10 +1,17 @@
+/*
+ * 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.
+ */
+
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
  * Version 1.0
  * RFCNB Error Response Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*

diff --git a/lib/rfcnb/rfcnb-io.c b/lib/rfcnb/rfcnb-io.c
index f628f1b3f5b849eca67d74e7c5ad527fb46762b1..16dfc3ce5f1c295088f6a1ba86a3fc1955f1c71d 100644 (file)
--- a/lib/rfcnb/rfcnb-io.c
+++ b/lib/rfcnb/rfcnb-io.c
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * 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.
+ */
 
 /* UNIX RFCNB (RFC1001/RFC1002) NEtBIOS implementation
  *
@@ -6,7 +12,6 @@
  * RFCNB IO Routines ...
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*
@@ -25,16 +30,17 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "squid.h"
 #include "rfcnb/rfcnb-io.h"
 #include "rfcnb/rfcnb-priv.h"
 #include "rfcnb/rfcnb-util.h"
 #include "rfcnb/std-includes.h"
-#include <sys/uio.h>
-#include <sys/signal.h>
 
 #if HAVE_STRING_H
 #include <string.h>
 #endif
+#include <sys/uio.h>
+#include <sys/signal.h>
 
 int RFCNB_Timeout = 0;          /* Timeout in seconds ... */
 

diff --git a/lib/rfcnb/rfcnb-io.h b/lib/rfcnb/rfcnb-io.h
index d3f0dfff90292b58b3362acfb57a809664c36d30..c612709d944dfa0816d8e925914f3bba9b274165 100644 (file)
--- a/lib/rfcnb/rfcnb-io.h
+++ b/lib/rfcnb/rfcnb-io.h
@@ -1,5 +1,10 @@
-#ifndef _SQUID__LIB_RFCNB_RFCNB_IO_H
-#define _SQUID__LIB_RFCNB_RFCNB_IO_H
+/*
+ * 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.
+ */
 
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
@@ -7,7 +12,6 @@
  * RFCNB IO Routines Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*
@@ -26,6 +30,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifndef _SQUID__LIB_RFCNB_RFCNB_IO_H
+#define _SQUID__LIB_RFCNB_RFCNB_IO_H
+
 #include "rfcnb/rfcnb.h"
 
 int RFCNB_Put_Pkt(struct RFCNB_Con *con, struct RFCNB_Pkt *pkt, int len);

diff --git a/lib/rfcnb/rfcnb-priv.h b/lib/rfcnb/rfcnb-priv.h
index cf65eb1a690e9af82f764b9ca2f6b3145b0b96f4..6108aa70ba2a4dd307f138995130db3d65ec64b6 100644 (file)
--- a/lib/rfcnb/rfcnb-priv.h
+++ b/lib/rfcnb/rfcnb-priv.h
@@ -1,10 +1,17 @@
+/*
+ * 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.
+ */
+
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
  * Version 1.0
  * RFCNB Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*

diff --git a/lib/rfcnb/rfcnb-util.c b/lib/rfcnb/rfcnb-util.c
index 2fd43489233d463ba403d3c8eb37ee10388d50f3..16dab40ab6b4897ff3d8985a5aa80e792991f4b5 100644 (file)
--- a/lib/rfcnb/rfcnb-util.c
+++ b/lib/rfcnb/rfcnb-util.c
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * 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.
+ */
 
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
@@ -6,7 +12,6 @@
  * RFCNB Utility Routines ...
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*
@@ -25,6 +30,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "squid.h"
 #include "rfcnb/rfcnb-io.h"
 #include "rfcnb/rfcnb-priv.h"
 #include "rfcnb/rfcnb-util.h"

diff --git a/lib/rfcnb/rfcnb-util.h b/lib/rfcnb/rfcnb-util.h
index 270857bce68ac4216606ed7a5b48dcad387fb2e4..858256499e5e2ed94dcf526c2241d3f02c2f360d 100644 (file)
--- a/lib/rfcnb/rfcnb-util.h
+++ b/lib/rfcnb/rfcnb-util.h
@@ -1,5 +1,10 @@
-#ifndef _RFCNB_RFCNB_UTIL_H
-#define _RFCNB_RFCNB_UTIL_H
+/*
+ * 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.
+ */
 
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
@@ -7,7 +12,6 @@
  * RFCNB Utility Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*
@@ -26,6 +30,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifndef _RFCNB_RFCNB_UTIL_H
+#define _RFCNB_RFCNB_UTIL_H
+
 #include "rfcnb/std-includes.h"
 
 void RFCNB_CvtPad_Name(char *name1, char *name2);

diff --git a/lib/rfcnb/rfcnb.h b/lib/rfcnb/rfcnb.h
index 89cfb5787fcdab3cb14e0e2f1305b5d2448bac0d..28e3241bfc70502a263f199d7a437ee658e0fcfe 100644 (file)
--- a/lib/rfcnb/rfcnb.h
+++ b/lib/rfcnb/rfcnb.h
@@ -1,10 +1,17 @@
+/*
+ * 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.
+ */
+
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
  * Version 1.0
  * RFCNB Defines
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*

diff --git a/lib/rfcnb/session.c b/lib/rfcnb/session.c
index 35ca1c2e42ca647b5be06644fad258d28143c25f..d76bbf34a5bd9bcbd264e4a597b1f120ab848b6a 100644 (file)
--- a/lib/rfcnb/session.c
+++ b/lib/rfcnb/session.c
@@ -1,4 +1,10 @@
-#include "squid.h"
+/*
+ * 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.
+ */
 
 /* UNIX RFCNB (RFC1001/RFC1002) NetBIOS implementation
  *
@@ -6,7 +12,6 @@
  * Session Routines ...
  *
  * Copyright (C) Richard Sharpe 1996
- *
  */
 
 /*
@@ -25,6 +30,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "squid.h"
+
 int RFCNB_errno = 0;
 int RFCNB_saved_errno = 0;
 #define RFCNB_ERRNO

diff --git a/lib/rfcnb/std-includes.h b/lib/rfcnb/std-includes.h
index ff3bcfc1f975e6f2076dc802ba140cb562911c8d..feec137886256b7819c68f9aba6b0522783b87d5 100644 (file)
--- a/lib/rfcnb/std-includes.h
+++ b/lib/rfcnb/std-includes.h
@@ -1,4 +1,11 @@
-/* RFCNB Standard includes ... */
+/*
+ * 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.
+ */
+
 /*
  *
  * RFCNB Standard Includes
@@ -6,8 +13,6 @@
  * Copyright (C) 1996, Richard Sharpe
  */
 
-/* One day we will conditionalize these on OS types ... */
-
 /*
  * 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
@@ -23,9 +28,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
 #ifndef _RFCNB_STD_INCLUDES_H
 #define _RFCNB_STD_INCLUDES_H
 
+/* RFCNB Standard includes ... */
+/* One day we will conditionalize these on OS types ... */
+
 #define BOOL int
 typedef short int16;