From: Amos Jeffries Date: Thu, 28 Aug 2014 05:07:21 +0000 (-0700) Subject: Boilerplate: update copyright blurbs on lib/librfcnb X-Git-Tag: SQUID_3_5_0_1~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=462566c5bd8ee41ee11c184231334ea24ec2975e;p=thirdparty%2Fsquid.git 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 46e1821785..1622c39c28 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -26,6 +26,7 @@ Thank you! Andrew Beverley Andrew Hoying Andrey Shorin + Andrew Tridgell Anonymous Ansgar Hockmann Anthony Baxter @@ -210,6 +211,7 @@ Thank you! Rene Geile Reuben Farrelly Richard Huveneers + Richard Sharpe Richard Wall Robert Collins Robert Collins diff --git a/CREDITS b/CREDITS index 6e9aac010e..cd6b685a57 100644 --- 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 b3711703c6..4b24ac3595 100644 --- 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 d8ddd8ea6d..dbf72a6152 100644 --- 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 1ab2be37e6..57634b351b 100644 --- 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 3432fc63e4..a9c4dd3f43 100644 --- 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 f628f1b3f5..16dfc3ce5f 100644 --- 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 -#include #if HAVE_STRING_H #include #endif +#include +#include int RFCNB_Timeout = 0; /* Timeout in seconds ... */ diff --git a/lib/rfcnb/rfcnb-io.h b/lib/rfcnb/rfcnb-io.h index d3f0dfff90..c612709d94 100644 --- 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 cf65eb1a69..6108aa70ba 100644 --- 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 2fd4348923..16dab40ab6 100644 --- 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 270857bce6..858256499e 100644 --- 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 89cfb5787f..28e3241bfc 100644 --- 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 35ca1c2e42..d76bbf34a5 100644 --- 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 ff3bcfc1f9..feec137886 100644 --- 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;