From: Amos Jeffries Date: Thu, 28 Aug 2014 14:44:55 +0000 (-0700) Subject: Boilerplate: update copyright blurb for lib/smblib X-Git-Tag: SQUID_3_5_0_1~83 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04e4e1401b1cd0851211c6dd889ad12a113c5f2b;p=thirdparty%2Fsquid.git Boilerplate: update copyright blurb for lib/smblib * Add Squid Software Foundation blurbs * update CONTRIBUTORS with missing authors (third-party) * update CREDITS with missing lib/smblib details - also some missing lib/rfcnb details --- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1622c39c28..397a94f6d0 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -120,6 +120,7 @@ Thank you! Jean-Francois Micouleau Jean-Gabriel Dick Jean-Philippe Menil + Jeremy Allison Jerry Murdock Joachim Bauch Joao Alves Neto @@ -165,6 +166,7 @@ Thank you! Matthew Morgan Matthias Pitzl Max Okumoto + Merik Karman Michael Lupp Michael Mansour Michael O'Reilly diff --git a/CREDITS b/CREDITS index cd6b685a57..e2b880b0b5 100644 --- a/CREDITS +++ b/CREDITS @@ -794,7 +794,11 @@ include/snmp_util.h: ============================================================================== -lib/rfcnb/: +lib/rfcnb/, +lib/smblib/: + + Copyright holders: Richard Sharpe, Andrew Tridgell, and Merik Karman + with updates by Squid contributors * 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 diff --git a/lib/smblib/Makefile.am b/lib/smblib/Makefile.am index 39d883db5d..ad8456dc54 100644 --- a/lib/smblib/Makefile.am +++ b/lib/smblib/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/smblib/bad-chain.c b/lib/smblib/bad-chain.c index 096db45381..3e2795dfce 100644 --- a/lib/smblib/bad-chain.c +++ b/lib/smblib/bad-chain.c @@ -1,11 +1,17 @@ -#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 SMBlib NetBIOS implementation Version 1.0 SMBlib Routines. Experimental Section ... Copyright (C) Richard Sharpe 1996 - */ /* @@ -24,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb.h" #include "smblib/smblib-priv.h" diff --git a/lib/smblib/exper.c b/lib/smblib/exper.c index 0ce10b67d1..ee8c9778e0 100644 --- a/lib/smblib/exper.c +++ b/lib/smblib/exper.c @@ -1,11 +1,17 @@ -#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 SMBlib NetBIOS implementation Version 1.0 SMBlib Routines. Experimental Section ... Copyright (C) Richard Sharpe 1996 - */ /* @@ -24,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb.h" #include "smblib/smblib-priv.h" diff --git a/lib/smblib/file.c b/lib/smblib/file.c index afd7cf3401..080db5b350 100644 --- a/lib/smblib/file.c +++ b/lib/smblib/file.c @@ -1,11 +1,17 @@ -#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 SMBlib NetBIOS implementation Version 1.0 SMBlib File Access Routines Copyright (C) Richard Sharpe 1996 - */ /* @@ -24,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb.h" #include "smblib/smblib-priv.h" diff --git a/lib/smblib/find_password.c b/lib/smblib/find_password.c index 782283f1ca..8e5be8b03a 100644 --- a/lib/smblib/find_password.c +++ b/lib/smblib/find_password.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" /* Find passwords ... */ /* We do it in a brute force way ... Cycle through all the possible passwords diff --git a/lib/smblib/md4.c b/lib/smblib/md4.c index 1cfb224a6e..2436a7fabc 100644 --- a/lib/smblib/md4.c +++ b/lib/smblib/md4.c @@ -1,11 +1,19 @@ -#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 SMB/Netbios implementation. * Version 1.9. * a implementation of MD4 designed for use in the SMB authentication protocol * Copyright (C) Andrew Tridgell 1997 - * + */ + +/* * 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 @@ -21,6 +29,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include #include "smblib/md4.h" diff --git a/lib/smblib/md4.h b/lib/smblib/md4.h index f2ad749654..0b44c9216d 100644 --- a/lib/smblib/md4.h +++ b/lib/smblib/md4.h @@ -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 __SMB_LM_SMBVAL_MD4_H #define __SMB_LM_SMBVAL_MD4_H diff --git a/lib/smblib/smb-errors.c b/lib/smblib/smb-errors.c index 80f355f7d8..08d0790390 100644 --- a/lib/smblib/smb-errors.c +++ b/lib/smblib/smb-errors.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 SMBlib NetBIOS implementation @@ -6,7 +12,6 @@ SMBlib Error values etc ... Copyright (C) Richard Sharpe, Andrew Tridgell, and Merik Karman, 1996 - */ /* @@ -31,6 +36,8 @@ /* ensure we don't overwrite strings when not passed enough space. Also */ /* added code to say unknown error codes if we see any */ +#include "squid.h" + typedef struct { char *name; int code; diff --git a/lib/smblib/smbdes.c b/lib/smblib/smbdes.c index 2785af0c3a..a8a3ff9461 100644 --- a/lib/smblib/smbdes.c +++ b/lib/smblib/smbdes.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 SMB/Netbios implementation. @@ -8,7 +14,9 @@ * SMB authentication protocol * * Copyright (C) Andrew Tridgell 1997 - * + */ + +/* * 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 @@ -24,6 +32,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" + /* NOTES: * * This code makes no attempt to be fast! In fact, it is a very diff --git a/lib/smblib/smbdes.h b/lib/smblib/smbdes.h index 20c7da1e86..ecb23feca5 100644 --- a/lib/smblib/smbdes.h +++ b/lib/smblib/smbdes.h @@ -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. + */ + /* smbdes.c */ void E_P16(unsigned char *p14, unsigned char *p16); void E_P24(unsigned char *p21, unsigned char *c8, unsigned char *p24); diff --git a/lib/smblib/smbencrypt.c b/lib/smblib/smbencrypt.c index 7efdeac8a9..66b6805a2f 100644 --- a/lib/smblib/smbencrypt.c +++ b/lib/smblib/smbencrypt.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 SMB/Netbios implementation. @@ -6,7 +12,9 @@ * SMB parameters and setup * Copyright (C) Andrew Tridgell 1992-1997 * Modified by Jeremy Allison 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 @@ -22,6 +30,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" + #include #include #include diff --git a/lib/smblib/smbencrypt.h b/lib/smblib/smbencrypt.h index 206a6d1ef1..faeafadd86 100644 --- a/lib/smblib/smbencrypt.h +++ b/lib/smblib/smbencrypt.h @@ -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 _SMBLIB_SMBENCRYPT_H #define _SMBLIB_SMBENCRYPT_H diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c index ea628ab749..616ee3a07c 100644 --- a/lib/smblib/smblib-api.c +++ b/lib/smblib/smblib-api.c @@ -1,11 +1,17 @@ -#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 SMBlib NetBIOS implementation Version 1.0 SMB API Calls ... Copyright (C) Richard Sharpe 1996 - */ /* @@ -24,6 +30,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" #include "rfcnb/rfcnb.h" #include "smblib/smblib-priv.h" diff --git a/lib/smblib/smblib-common.h b/lib/smblib/smblib-common.h index 065fa0fe40..9fd789fb6d 100644 --- a/lib/smblib/smblib-common.h +++ b/lib/smblib/smblib-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 SMBlib NetBIOS implementation Version 1.0 SMBlib Common Defines Copyright (C) Richard Sharpe 1996 - */ /* diff --git a/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h index ebb261fa13..300f297e84 100644 --- a/lib/smblib/smblib-priv.h +++ b/lib/smblib/smblib-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 SMBlib NetBIOS implementation Version 1.0 SMBlib private Defines Copyright (C) Richard Sharpe 1996 - */ /* diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c index ee05a00671..ae7420aec4 100644 --- a/lib/smblib/smblib-util.c +++ b/lib/smblib/smblib-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 SMBlib NetBIOS implementation @@ -6,7 +12,6 @@ SMBlib 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.h" #include "smblib/smblib-priv.h" #include "smblib/smblib.h" diff --git a/lib/smblib/smblib.c b/lib/smblib/smblib.c index 3a2fd54158..7b0b84181f 100644 --- a/lib/smblib/smblib.c +++ b/lib/smblib/smblib.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 SMBlib NetBIOS implementation @@ -6,7 +12,6 @@ SMBlib Routines Copyright (C) Richard Sharpe 1996 - */ /* @@ -25,6 +30,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "squid.h" + int SMBlib_errno; int SMBlib_SMB_Error; #define SMBLIB_ERRNO diff --git a/lib/smblib/smblib.h b/lib/smblib/smblib.h index 4e6ae00300..ccbd28225e 100644 --- a/lib/smblib/smblib.h +++ b/lib/smblib/smblib.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 SMBlib NetBIOS implementation Version 1.0 SMBlib Defines Copyright (C) Richard Sharpe 1996 - */ /* diff --git a/lib/smblib/std-defines.h b/lib/smblib/std-defines.h index d6a3d2137b..013824dd7c 100644 --- a/lib/smblib/std-defines.h +++ b/lib/smblib/std-defines.h @@ -1,14 +1,16 @@ -#ifndef _SMBLIB_STD_DEFINES_H -#define _SMBLIB_STD_DEFINES_H - -/* 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. + */ +/* SMBlib Standard Includes 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 @@ -26,6 +28,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _SMBLIB_STD_DEFINES_H +#define _SMBLIB_STD_DEFINES_H + +/* RFCNB Standard includes ... */ +/* One day we will conditionalize these on OS types ... */ + #define BOOL int #include