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 1622c39c284c6a0549ae7d815f05bc3e4a3d7c17..397a94f6d0b038e97f57b14cb63078f5fd233be5 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -120,6 +120,7 @@ Thank you!
     Jean-Francois Micouleau <Jean-Francois.Micouleau@utc.fr>
     Jean-Gabriel Dick <jean-gabriel.dick@curie.fr>
     Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
+    Jeremy Allison
     Jerry Murdock <jmurdock@itraktech.com>
     Joachim Bauch <jojo@fistofbenztown.de>
     Joao Alves Neto <alves_joao@hotmail.com>
@@ -165,6 +166,7 @@ Thank you!
     Matthew Morgan <atcs.matthew@gmail.com>
     Matthias Pitzl <silamael@coronamundi.de>
     Max Okumoto <okumoto@ucsd.edu>
+    Merik Karman
     Michael Lupp <mike@nemesis.saar.de>
     Michael Mansour <mic@shell.gnxs.com.au>
     Michael O'Reilly <michael@metal.iinet.net.au>

diff --git a/CREDITS b/CREDITS
index cd6b685a57ba4de67c7c3adf85e2fdfc7543076f..e2b880b0b5554e11d44d27cb4d9a27950a24fbdd 100644 (file)
--- 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 39d883db5df8655015ec053f909825b99dcf1bfc..ad8456dc546d5d0f865132700292e1cb1f602605 100644 (file)
--- 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 096db453811d80d076473fb8e4965ad95b9e4563..3e2795dfce7a1d0d95e784319207ea6fa3f09da2 100644 (file)
--- 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 0ce10b67d1bc893cb7fdfbc3f3f8849b9a560bc9..ee8c9778e07f23bd59147bd58d15145cb3c7181d 100644 (file)
--- 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 afd7cf3401f705a894702e43d317108d751380d6..080db5b350124b309f1023f10d375d78d9d034fd 100644 (file)
--- 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 782283f1ca58c510966479641ef8b6fe42a01b2b..8e5be8b03ae9cd2ce6e5a6e69b20780ea1731ea5 100644 (file)
--- 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 1cfb224a6eddcb450286ef6be4eeeea10a4fc29e..2436a7fabc57c0a0937b7109ccd8085417722859 100644 (file)
--- 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 <string.h>
 #include "smblib/md4.h"
 

diff --git a/lib/smblib/md4.h b/lib/smblib/md4.h
index f2ad7496542df45af4b0540c0b5c452f742236b3..0b44c9216d0609ea7523bc38b982db9f3bf32114 100644 (file)
--- 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 80f355f7d8d9b3a723fd5b1bafdbc9fd396d2124..08d07903905a591e26efc32696b9ca6939f45360 100644 (file)
--- 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 2785af0c3a264ad0832597de012bacdc2e44853b..a8a3ff9461f8baf3e62b10595d069f5867a41caa 100644 (file)
--- 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 20c7da1e8603d45c84bd104a352302a41f15b5e5..ecb23feca52482a4cfcc673ad5a007444f817207 100644 (file)
--- 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 7efdeac8a9fe535c91b25a7dc70743c46cfe8045..66b6805a2f3dff1b18013d458c100e86721213aa 100644 (file)
--- 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 <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/lib/smblib/smbencrypt.h b/lib/smblib/smbencrypt.h
index 206a6d1ef1f5033015f6e4e424b6c4308bc9df64..faeafadd86c7ec6c9ba4ab09c1aa519cd373c308 100644 (file)
--- 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 ea628ab749d5f1d91c78afed5a281ad6c89ed94d..616ee3a07c30faf9ed060345938112cf97a097c2 100644 (file)
--- 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 065fa0fe406af0e709c009f69181740b0f61d6bf..9fd789fb6d9bd4d180d148a9da9ea1244c2b9ed3 100644 (file)
--- 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 ebb261fa1338ef934ce4700f6c58f60495500457..300f297e84177f695113cbb26df04f8e82a02165 100644 (file)
--- 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 ee05a006710dd3fcd5d8e0fbf16290942bba2a69..ae7420aec410da801e2622ddffdbf5871ec9335e 100644 (file)
--- 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 3a2fd54158aa1673b24d2bf98e6fd5d5af311bef..7b0b84181f47740de832994e5f6439291d27813b 100644 (file)
--- 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 4e6ae003009cf4cb45f9e8ad980de08bed25240d..ccbd28225e7470a5cad9b8e1b159f8a112e0c57c 100644 (file)
--- 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 d6a3d2137b1bacdafef3e8a7d0ff4c4ffaade09b..013824dd7c22586e21d0b5c71129bb9d2b6ee6eb 100644 (file)
--- 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 <netdb.h>