ext_ldap_group_acl: Version 2.18 documentation updates

Bump the helper version number to 2.18 as should have been done back in
2010 when previous redesign was made.

Also, add copyright notices to ChangeLog indicating MARA Systems
copyright to original 2.17 and older code, Squid Project on 2.18 and
newer additions.

diff --git a/helpers/external_acl/LDAP_group/ChangeLog b/helpers/external_acl/LDAP_group/ChangeLog
index 06abfc87c03b3e22a484bfd9fe781b95f153f61b..7fbcf0a8fa1bee31bcff8fffc8248293f0f8d7ec 100644 (file)
--- a/helpers/external_acl/LDAP_group/ChangeLog
+++ b/helpers/external_acl/LDAP_group/ChangeLog
@@ -1,4 +1,12 @@
-Version 2.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.
+ */
+
+Version 2.18
 
 2010-07-12 Amos Jeffries <amosjeffries@squid-cache.org>
 
@@ -7,6 +15,40 @@ Version 2.17
        Remove several goto statements.
        Update to use helper macro API
 
+/*
+ * ext_ldap_group_acl: lookup group membership in LDAP
+ *
+ * Version 2.17
+ *
+ * (C)2002,2003 MARA Systems AB
+ *
+ * License: squid_ldap_group 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,
+ * or (at your option) any later version.
+ *
+ * Authors:
+ *  Flavio Pescuma <flavio@marasystems.com>
+ *  Henrik Nordstrom <hno@marasystems.com>
+ *  MARA Systems AB, Sweden <http://www.marasystems.com>
+ *
+ * With contributions from others mentioned in the ChangeLog file
+ *
+ * In part based on squid_ldap_auth by Glen Newton and Henrik Nordstrom.
+ *
+ * Latest version of this program can always be found from MARA Systems
+ * at http://marasystems.com/download/LDAP_Group/
+ *
+ * Dependencies: You need to get the OpenLDAP libraries
+ * from http://www.openldap.org or use another compatible
+ * LDAP C-API library.
+ *
+ * If you want to make a TLS enabled connection you will also need the
+ * OpenSSL libraries linked into openldap. See http://www.openssl.org/
+ */
+
+Version 2.17
+
 2005-03-19 Henrik Nordstrom <hno@squid-cache.org>
 
        Bug #1258: LDAP helpers fails to compile with SUN LDAP SDK

diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
index 76e6c6b3e7237b8fc2320ef1024257bc60f0ad6c..f2dcc703aecdce110dbc571301f0be20bfbb755c 100644 (file)
--- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
+++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.8
@@ -3,7 +3,7 @@
 .SH NAME
 ext_ldap_group_acl \- Squid LDAP external acl group helper
 .PP
-Version 2.17
+Version 2.18
 .
 .SH SYNOPSIS
 .if !'po4a'hide' .B ext_ldap_group_acl

diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
index 947bdb045683836c7a91f9b1d5a1aefd553f55d4..4379f813d23715b9514aeafd2e2fe466d4fe0a8e 100644 (file)
--- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
+++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
@@ -86,7 +86,7 @@ PFldap_start_tls_s Win32_ldap_start_tls_s;
 #endif
 
 #define PROGRAM_NAME "ext_ldap_group_acl"
-#define PROGRAM_VERSION "2.17"
+#define PROGRAM_VERSION "2.18"
 
 /* Globals */