------------------------------------------------------------ revno: 13695 revision-id: squid3@treenet.co.nz-20141218130657-1d00v83qbt4t44zw parent: squid3@treenet.co.nz-20141218130622-74w4a5snswqgv9ig committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2014-12-18 05:06:57 -0800 message: 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. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20141218130657-1d00v83qbt4t44zw # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 9c1f44c5cb435abe1c4eb4fb8973a315a6351849 # timestamp: 2014-12-18 13:51:05 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20141218130622-\ # 74w4a5snswqgv9ig # # Begin patch === modified file 'helpers/external_acl/LDAP_group/ChangeLog' --- helpers/external_acl/LDAP_group/ChangeLog 2010-07-12 14:45:17 +0000 +++ helpers/external_acl/LDAP_group/ChangeLog 2014-12-18 13:06:57 +0000 @@ -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 @@ -7,6 +15,40 @@ 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 + * Henrik Nordstrom + * MARA Systems AB, Sweden + * + * 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 Bug #1258: LDAP helpers fails to compile with SUN LDAP SDK === modified file 'helpers/external_acl/LDAP_group/ext_ldap_group_acl.8' --- helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 2014-10-31 09:12:50 +0000 +++ helpers/external_acl/LDAP_group/ext_ldap_group_acl.8 2014-12-18 13:06:57 +0000 @@ -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 === modified file 'helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc' --- helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2014-09-13 13:31:49 +0000 +++ helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc 2014-12-18 13:06:57 +0000 @@ -86,7 +86,7 @@ #endif #define PROGRAM_NAME "ext_ldap_group_acl" -#define PROGRAM_VERSION "2.17" +#define PROGRAM_VERSION "2.18" /* Globals */