From: Kurt Zeilenga Date: Sun, 16 Aug 2009 22:55:23 +0000 (+0000) Subject: Update contrib notices to reflect that they are distributed as part of X-Git-Tag: ACLCHECK_0~327 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a5abeb92ec964129c6e33f30f438e4e92a4ae05a;p=openldap Update contrib notices to reflect that they are distributed as part of OpenLDAP Software (though they may not necessarily be supported by the OpenLDAP Project). Assistance in updating ACKNOWLEDGEMENTS welcomed. --- diff --git a/contrib/README b/contrib/README index 20bc84f83c..b1849fbc22 100644 --- a/contrib/README +++ b/contrib/README @@ -1,10 +1,11 @@ OpenLDAP Contributed Software README OpenLDAP Project provides a number of freely-distributable LDAP -software packages. Though distributed with OpenLDAP Software, they -are not part of OpenLDAP Software. Some packages may be out of -date. Each package in this directory has it's own use and -redistribution restrictions as documented within the package. +software packages. While distributed with as part of OpenLDAP Software, +they are not necessarily supported by the OpenLDAP Project. Some +packages may be out of date. Each package in this directory has it's +own use and may be different redistribution restrictions than typical +for OpenLDAP Software. Current contributions: ldapc++ diff --git a/contrib/slapd-modules/acl/README b/contrib/slapd-modules/acl/README index 5cc21056ed..da425cfd69 100644 --- a/contrib/slapd-modules/acl/README +++ b/contrib/slapd-modules/acl/README @@ -1,9 +1,3 @@ -Copyright 2005-2009 The OpenLDAP Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - This directory contains native slapd plugins that implement access rules. posixgroup.c contains a simple example that implements access control @@ -34,3 +28,10 @@ gcc -shared -I../../../include -I../../../servers/slapd -Wall -g \ to compile the posixGroup ACL plugin. +--- +Copyright 2005-2009 The OpenLDAP Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + diff --git a/contrib/slapd-modules/acl/posixgroup.c b/contrib/slapd-modules/acl/posixgroup.c index 4769e3218c..f9ab333195 100644 --- a/contrib/slapd-modules/acl/posixgroup.c +++ b/contrib/slapd-modules/acl/posixgroup.c @@ -1,5 +1,7 @@ +/* posixgroup.c */ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * diff --git a/contrib/slapd-modules/addpartial/COPYRIGHT b/contrib/slapd-modules/addpartial/COPYRIGHT deleted file mode 100644 index fda001e3c7..0000000000 --- a/contrib/slapd-modules/addpartial/COPYRIGHT +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (C) Virginia Tech, David Hawes. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in file LICENSE in the -top-level directory of the distribution or, alternatively, at -http://www.OpenLDAP.org/license.html. diff --git a/contrib/slapd-modules/addpartial/LICENSE b/contrib/slapd-modules/addpartial/LICENSE deleted file mode 100644 index 83a87efa84..0000000000 --- a/contrib/slapd-modules/addpartial/LICENSE +++ /dev/null @@ -1,47 +0,0 @@ -The OpenLDAP Public License - Version 2.8, 17 August 2003 - - Redistribution and use of this software and associated documentation - ("Software"), with or without modification, are permitted provided - that the following conditions are met: - - 1. Redistributions in source form must retain copyright statements - and notices, - - 2. Redistributions in binary form must reproduce applicable copyright - statements and notices, this list of conditions, and the following - disclaimer in the documentation and/or other materials provided - with the distribution, and - - 3. Redistributions must contain a verbatim copy of this document. - -The OpenLDAP Foundation may revise this license from time to time. -Each revision is distinguished by a version number. You may use -this Software under terms of this license revision or under the -terms of any subsequent revision of the license. - -THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS -CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) -OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -The names of the authors and copyright holders must not be used in -advertising or otherwise to promote the sale, use or other dealing -in this Software without specific, written prior permission. Title -to copyright in this Software shall at all times remain with copyright -holders. - -OpenLDAP is a registered trademark of the OpenLDAP Foundation. - -Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, -California, USA. All Rights Reserved. Permission to copy and -distribute verbatim copies of this document is granted. diff --git a/contrib/slapd-modules/addpartial/README b/contrib/slapd-modules/addpartial/README index fea67d1659..02cc1676a3 100644 --- a/contrib/slapd-modules/addpartial/README +++ b/contrib/slapd-modules/addpartial/README @@ -57,3 +57,16 @@ CAVEATS This is especially important if you are using syncrepl, as the modify that addpartial does will muck with the locking that takes place in the syncprov overlay. + +--- +Copyright 2004-2009 The OpenLDAP Foundation. +Portions Copyright (C) Virginia Tech, David Hawes. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in file LICENSE in the +top-level directory of the distribution or, alternatively, at +http://www.OpenLDAP.org/license.html. diff --git a/contrib/slapd-modules/addpartial/addpartial-overlay.c b/contrib/slapd-modules/addpartial/addpartial-overlay.c index 85fb6c3a16..309391a119 100644 --- a/contrib/slapd-modules/addpartial/addpartial-overlay.c +++ b/contrib/slapd-modules/addpartial/addpartial-overlay.c @@ -1,7 +1,9 @@ -/** - * $Id: addpartial-overlay.c 6588 2007-11-07 18:29:25Z dhawes $ +/* addpartial-overlay.c */ +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * Copyright (C) 2004 Virginia Tech, David Hawes. + * Copyright 2004-2009 The OpenLDAP Foundation. + * Portions Copyright (C) 2004 Virginia Tech, David Hawes. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,15 +13,12 @@ * A copy of this license is available in file LICENSE in the * top-level directory of the distribution or, alternatively, at * http://www.OpenLDAP.org/license.html. - * - * SEE LICENSE FOR MORE INFORMATION - * - * Author: David H. Hawes, Jr. - * Email: dhawes@vt.edu - * Version: $Revision: 8385 $ - * Updated: $Date: 2008-11-04 12:19:52 -0500 (Tue, 04 Nov 2008) $ - * - * addpartial-overlay + */ +/* ACKNOLEDGEDMENTS: + * This work was initially developed by David Hawes of Virginia Tech + * for inclusion in OpenLDAP Software. + */ +/* addpartial-overlay * * This is an OpenLDAP overlay that intercepts ADD requests, determines if a * change has actually taken place for that record, and then performs a modify diff --git a/contrib/slapd-modules/allop/README b/contrib/slapd-modules/allop/README index 47b3d2438e..5e054cae5d 100644 --- a/contrib/slapd-modules/allop/README +++ b/contrib/slapd-modules/allop/README @@ -1,9 +1,3 @@ -Copyright 2004-2009 The OpenLDAP Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - This directory contains a slapd overlay, allop. The intended usage is as a global overlay for use with those clients that do not make use of the RFC3673 allOp ("+") in the requested @@ -25,3 +19,10 @@ gcc -shared -I../../../include -I../../../servers/slapd -Wall -g \ to compile this overlay. +--- +Copyright 2004-2009 The OpenLDAP Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + diff --git a/contrib/slapd-modules/autogroup/COPYRIGHT b/contrib/slapd-modules/autogroup/COPYRIGHT deleted file mode 100644 index e6100c6f2b..0000000000 --- a/contrib/slapd-modules/autogroup/COPYRIGHT +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (C) 2007 Michał Szulczyński. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in file LICENSE in the -top-level directory of the distribution or, alternatively, at -http://www.OpenLDAP.org/license.html. diff --git a/contrib/slapd-modules/autogroup/README b/contrib/slapd-modules/autogroup/README index 51a2bb93cb..6b3fe1372d 100644 --- a/contrib/slapd-modules/autogroup/README +++ b/contrib/slapd-modules/autogroup/README @@ -69,4 +69,17 @@ CAVEATS of members may be slow. ACKNOWLEDGEMENTS - This module was written in 2007 by Michał Szulczyński. + This module was originally written in 2007 by Michał Szulczyński. + +--- +Copyright 1998-2009 The OpenLDAP Foundation. +Portions Copyright (C) 2007 Michał Szulczyński. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in file LICENSE in the +top-level directory of the distribution or, alternatively, at +http://www.OpenLDAP.org/license.html. diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c index 92048e5d49..f7b46b8b52 100644 --- a/contrib/slapd-modules/autogroup/autogroup.c +++ b/contrib/slapd-modules/autogroup/autogroup.c @@ -1,7 +1,9 @@ /* autogroup.c - automatic group overlay */ /* $OpenLDAP$ */ -/* - * Copyright 2007 Michał Szulczyński. +/* This work is part of OpenLDAP Software . + * + * Copyright 2007-2009 The OpenLDAP Foundation. + * Portions Copyright 2007 Michał Szulczyński. * Portions Copyright 2009 Howard Chu. * All rights reserved. * @@ -13,6 +15,11 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by Michał Szulczyński for inclusion in + * OpenLDAP Software. Additional significant contributors include: + * Howard Chu + */ #include "portable.h" diff --git a/contrib/slapd-modules/cloak/cloak.c b/contrib/slapd-modules/cloak/cloak.c index 8d29a1579c..671d4519be 100644 --- a/contrib/slapd-modules/cloak/cloak.c +++ b/contrib/slapd-modules/cloak/cloak.c @@ -1,7 +1,9 @@ -/* $OpenLDAP$ */ /* cloak.c - Overlay to hide some attribute except if explicitely requested */ -/* - * Copyright 2008 Emmanuel Dreyfus +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 Emmanuel Dreyfus * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,6 +14,11 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This work was originally developed by the Emmanuel Dreyfus for + * inclusion in OpenLDAP Software. + */ + #include "portable.h" #ifdef SLAPD_OVER_CLOAK diff --git a/contrib/slapd-modules/cloak/slapo-cloak.5 b/contrib/slapd-modules/cloak/slapo-cloak.5 index 915ffe259c..58c0cf6e1a 100644 --- a/contrib/slapd-modules/cloak/slapo-cloak.5 +++ b/contrib/slapd-modules/cloak/slapo-cloak.5 @@ -79,4 +79,4 @@ overlay supports dynamic configuration via .BR back-config . .SH ACKNOWLEDGEMENTS .P -This module was written in 2008 by Emmanuel Dreyfus. +This module was originally written in 2008 by Emmanuel Dreyfus. diff --git a/contrib/slapd-modules/dsaschema/dsaschema.c b/contrib/slapd-modules/dsaschema/dsaschema.c index dda43044f4..038edbd20a 100644 --- a/contrib/slapd-modules/dsaschema/dsaschema.c +++ b/contrib/slapd-modules/dsaschema/dsaschema.c @@ -1,5 +1,7 @@ +/* dsaschema.c */ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * * Copyright 2004-2009 The OpenLDAP Foundation. * All rights reserved. * diff --git a/contrib/slapd-modules/nops/nops.c b/contrib/slapd-modules/nops/nops.c index 1fb1d34170..0e21b2d4a0 100644 --- a/contrib/slapd-modules/nops/nops.c +++ b/contrib/slapd-modules/nops/nops.c @@ -1,7 +1,9 @@ -/* $OpenLDAP$ */ /* nops.c - Overlay to filter idempotent operations */ -/* - * Copyright 2008 Emmanuel Dreyfus +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Copyright 2008 Emmanuel Dreyfus. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,6 +14,10 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This work was originally developed by the Emmanuel Dreyfus for + * inclusion in OpenLDAP Software. + */ #include "portable.h" #ifdef SLAPD_OVER_NOPS diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile index dd21999262..8421e88788 100644 --- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -1,5 +1,8 @@ # $OpenLDAP$ -# Copyright 2008 Howard Chu, Symas Corp. All Rights Reserved. +# This work is part of OpenLDAP Software . +# +# Copyright 2008-2009 The OpenLDAP Foundation. +# Portions Copyright 2008 Howard Chu, Symas Corp. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP diff --git a/contrib/slapd-modules/nssov/README b/contrib/slapd-modules/nssov/README index d0e527eff5..09f37b38a2 100644 --- a/contrib/slapd-modules/nssov/README +++ b/contrib/slapd-modules/nssov/README @@ -1,13 +1,3 @@ -Copyright 2008-2009 Howard Chu, Symas Corp. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in the file LICENSE in the -top-level directory of the distribution or, alternatively, at -. - This directory contains a slapd overlay, nssov, that handles NSS lookup requests through a local Unix Domain socket. It uses the same IPC protocol as Arthur de Jong's nss-ldapd, and a complete @@ -124,3 +114,18 @@ value upon logout. The attribute value is of the form Password management: the overlay will perform a PasswordModify exop in the server for the given user. + +--- +This work is part of OpenLDAP Software . + +Copyright 1998-2009 The OpenLDAP Foundation. +Portions Copyright 2008-2009 Howard Chu, Symas Corp. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapd-modules/nssov/alias.c b/contrib/slapd-modules/nssov/alias.c index 35aaa8f71d..658681c299 100644 --- a/contrib/slapd-modules/nssov/alias.c +++ b/contrib/slapd-modules/nssov/alias.c @@ -1,7 +1,9 @@ /* alias.c - mail alias lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/ether.c b/contrib/slapd-modules/nssov/ether.c index 9f07bbedd2..c4023db8c4 100644 --- a/contrib/slapd-modules/nssov/ether.c +++ b/contrib/slapd-modules/nssov/ether.c @@ -1,6 +1,8 @@ /* ether.c - ethernet address lookup routines */ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. * Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/group.c b/contrib/slapd-modules/nssov/group.c index 866dcd6a10..d2d5bfe117 100644 --- a/contrib/slapd-modules/nssov/group.c +++ b/contrib/slapd-modules/nssov/group.c @@ -1,7 +1,9 @@ /* group.c - group lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008-2009 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008-2009 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/host.c b/contrib/slapd-modules/nssov/host.c index 588e28e6e6..e10ad7e22c 100644 --- a/contrib/slapd-modules/nssov/host.c +++ b/contrib/slapd-modules/nssov/host.c @@ -1,7 +1,9 @@ /* host.c - host lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/ldapns.schema b/contrib/slapd-modules/nssov/ldapns.schema index 2cf9c0a163..22a4daf800 100644 --- a/contrib/slapd-modules/nssov/ldapns.schema +++ b/contrib/slapd-modules/nssov/ldapns.schema @@ -1,5 +1,4 @@ # $OpenLDAP$ -# $Id: ldapns.schema,v 1.3 2003/05/29 12:57:29 lukeh Exp $ # LDAP Name Service Additional Schema # http://www.iana.org/assignments/gssapi-service-names diff --git a/contrib/slapd-modules/nssov/netgroup.c b/contrib/slapd-modules/nssov/netgroup.c index b9d95c44c1..eae7c3fec1 100644 --- a/contrib/slapd-modules/nssov/netgroup.c +++ b/contrib/slapd-modules/nssov/netgroup.c @@ -1,7 +1,9 @@ /* netgroup.c - netgroup lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/network.c b/contrib/slapd-modules/nssov/network.c index efaf8b00ca..5707bfecce 100644 --- a/contrib/slapd-modules/nssov/network.c +++ b/contrib/slapd-modules/nssov/network.c @@ -1,7 +1,9 @@ /* network.c - network address lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c index fbd6191637..aae8fe2844 100644 --- a/contrib/slapd-modules/nssov/nssov.c +++ b/contrib/slapd-modules/nssov/nssov.c @@ -1,7 +1,9 @@ /* nssov.c - nss-ldap overlay for slapd */ /* $OpenLDAP$ */ -/* - * Copyright 2008-2009 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/nssov.h b/contrib/slapd-modules/nssov/nssov.h index 6e65ce0745..27c579e05f 100644 --- a/contrib/slapd-modules/nssov/nssov.h +++ b/contrib/slapd-modules/nssov/nssov.h @@ -4,6 +4,15 @@ * * Copyright 2008-2009 The OpenLDAP Foundation. * Portions Copyright 2008 Howard Chu. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ #ifndef NSSOV_H diff --git a/contrib/slapd-modules/nssov/pam.c b/contrib/slapd-modules/nssov/pam.c index d424999857..2f3969dd2d 100644 --- a/contrib/slapd-modules/nssov/pam.c +++ b/contrib/slapd-modules/nssov/pam.c @@ -1,7 +1,9 @@ /* pam.c - pam processing routines */ /* $OpenLDAP$ */ -/* - * Copyright 2009 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/nssov/passwd.c b/contrib/slapd-modules/nssov/passwd.c index 20ef4d67fb..3cfc9f341f 100644 --- a/contrib/slapd-modules/nssov/passwd.c +++ b/contrib/slapd-modules/nssov/passwd.c @@ -1,7 +1,9 @@ /* passwd.c - password lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/protocol.c b/contrib/slapd-modules/nssov/protocol.c index 6e6e5b8b8b..731ceaaa91 100644 --- a/contrib/slapd-modules/nssov/protocol.c +++ b/contrib/slapd-modules/nssov/protocol.c @@ -1,7 +1,9 @@ /* protocol.c - network protocol lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -13,6 +15,7 @@ * . */ /* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/rpc.c b/contrib/slapd-modules/nssov/rpc.c index b86d913180..7cbe3cc5d7 100644 --- a/contrib/slapd-modules/nssov/rpc.c +++ b/contrib/slapd-modules/nssov/rpc.c @@ -1,7 +1,9 @@ /* rpc.c - rpc lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/service.c b/contrib/slapd-modules/nssov/service.c index ac5390a180..b76ce8fcb6 100644 --- a/contrib/slapd-modules/nssov/service.c +++ b/contrib/slapd-modules/nssov/service.c @@ -1,7 +1,9 @@ /* service.c - service lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/nssov/shadow.c b/contrib/slapd-modules/nssov/shadow.c index f331e59cd1..d97f3100ff 100644 --- a/contrib/slapd-modules/nssov/shadow.c +++ b/contrib/slapd-modules/nssov/shadow.c @@ -1,7 +1,9 @@ /* shadow.c - shadow account lookup routines */ /* $OpenLDAP$ */ -/* - * Copyright 2008 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2008-2009 The OpenLDAP Foundation. + * Portions Copyright 2008 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +14,7 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * This code references portions of the nss-ldapd package * written by Arthur de Jong. The nss-ldapd code was forked * from the nss-ldap library written by Luke Howard. diff --git a/contrib/slapd-modules/passwd/README b/contrib/slapd-modules/passwd/README index 33e1b686d1..38b9ee7198 100644 --- a/contrib/slapd-modules/passwd/README +++ b/contrib/slapd-modules/passwd/README @@ -1,9 +1,3 @@ -Copyright 2004-2009 The OpenLDAP Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - This directory contains native slapd plugins for password mechanisms that are not actively supported by the project. Currently this includes the Kerberos, Netscape MTA-MD5 and RADIUS password mechanisms. @@ -48,3 +42,17 @@ gcc -shared -I../../../include -Wall -g -o pw-radius.so radius.c -lradius (Actually, you might want to statically link the RADIUS client library libradius.a into the module). +--- +This work is part of OpenLDAP Software . + +Copyright 2004-2009 The OpenLDAP Foundation. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapd-modules/passwd/kerberos.c b/contrib/slapd-modules/passwd/kerberos.c index dd229ca212..701d8886af 100644 --- a/contrib/slapd-modules/passwd/kerberos.c +++ b/contrib/slapd-modules/passwd/kerberos.c @@ -1,5 +1,6 @@ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * diff --git a/contrib/slapd-modules/passwd/netscape.c b/contrib/slapd-modules/passwd/netscape.c index 56ec58a2dc..a28c65b7cd 100644 --- a/contrib/slapd-modules/passwd/netscape.c +++ b/contrib/slapd-modules/passwd/netscape.c @@ -1,5 +1,6 @@ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * diff --git a/contrib/slapd-modules/passwd/radius.c b/contrib/slapd-modules/passwd/radius.c index 93d9313e74..c837c9e984 100644 --- a/contrib/slapd-modules/passwd/radius.c +++ b/contrib/slapd-modules/passwd/radius.c @@ -1,5 +1,6 @@ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * diff --git a/contrib/slapd-modules/passwd/sha2/slapd-sha2.c b/contrib/slapd-modules/passwd/sha2/slapd-sha2.c index 4c5e4f696f..0a25473494 100644 --- a/contrib/slapd-modules/passwd/sha2/slapd-sha2.c +++ b/contrib/slapd-modules/passwd/sha2/slapd-sha2.c @@ -1,4 +1,18 @@ /* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . + * + * Copyright 2009 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ + #include #include // Required for BER_BVC #include // Required for BER_BVC dep diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile index d58c8f1cee..1bd857283d 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -1,5 +1,8 @@ # $OpenLDAP$ -# Copyright 2005 Howard Chu, Symas Corp. All Rights Reserved. +# This work is part of OpenLDAP Software . +# +# Copyright 2005-2009 The OpenLDAP Foundation. +# Portions Copyright 2005 Howard Chu, Symas Corp. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP diff --git a/contrib/slapd-modules/proxyOld/README b/contrib/slapd-modules/proxyOld/README index 35797b2523..d342306bd0 100644 --- a/contrib/slapd-modules/proxyOld/README +++ b/contrib/slapd-modules/proxyOld/README @@ -1,13 +1,3 @@ -Copyright 2005 Howard Chu, Symas Corp. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in the file LICENSE in the -top-level directory of the distribution or, alternatively, at -. - This directory contains a slapd module proxyOld that provides support for the obsolete draft-weltman-ldapb3-proxy-05 revision of the LDAP Proxy Authorization control. It is merely intended to provide compatibility @@ -24,3 +14,18 @@ the control is registered with the SLAP_CTRL_HIDE flag so that it will not be advertised in the rootDSE's supportedControls attribute. This code only works as a dynamically loaded module. + +--- +This work is part of OpenLDAP Software . + +Copyright 1998-2009 The OpenLDAP Foundation. +Portions Copyright 2005 Howard Chu, Symas Corp. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapd-modules/proxyOld/proxyOld.c b/contrib/slapd-modules/proxyOld/proxyOld.c index 4286bb2e70..c51c6c80ec 100644 --- a/contrib/slapd-modules/proxyOld/proxyOld.c +++ b/contrib/slapd-modules/proxyOld/proxyOld.c @@ -1,7 +1,9 @@ /* proxyOld.c - module for supporting obsolete (rev 05) proxyAuthz control */ /* $OpenLDAP$ */ -/* - * Copyright 2005 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2005-2009 The OpenLDAP Foundation. + * Portions Copyright 2005 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile index 57f5a767f4..9d65025356 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -1,4 +1,7 @@ # $OpenLDAP$ +# This work is part of OpenLDAP Software . +# +# Copyright 1998-2009 The OpenLDAP Foundation. # Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README index 8031f534cf..344760a681 100644 --- a/contrib/slapd-modules/smbk5pwd/README +++ b/contrib/slapd-modules/smbk5pwd/README @@ -1,13 +1,3 @@ -Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in the file LICENSE in the -top-level directory of the distribution or, alternatively, at -. - This directory contains a slapd overlay, smbk5pwd, that extends the PasswordModify Extended Operation to update Kerberos keys and Samba password hashes for an LDAP user. @@ -88,3 +78,17 @@ If you need to build the overlay statically, you will have to move it into the slapd/overlays directory and edit the Makefile and overlays.c to reference it. You will also have to define SLAPD_OVER_SMBK5PWD to SLAPD_MOD_STATIC, and add the relevant libraries to the main slapd link command. + +--- +This work is part of OpenLDAP Software . +Copyright 2004-2009 The OpenLDAP Foundation. +Portions Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c index 0909348137..39cc03c26d 100644 --- a/contrib/slapd-modules/smbk5pwd/smbk5pwd.c +++ b/contrib/slapd-modules/smbk5pwd/smbk5pwd.c @@ -1,7 +1,9 @@ /* smbk5pwd.c - Overlay for managing Samba and Heimdal passwords */ /* $OpenLDAP$ */ -/* - * Copyright 2004-2005 by Howard Chu, Symas Corp. +/* This work is part of OpenLDAP Software . + * + * Copyright 2004-2009 The OpenLDAP Foundation. + * Portions Copyright 2004-2005 by Howard Chu, Symas Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,11 +14,9 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* +/* ACKNOWLEDGEMENTS: * Support for table-driven configuration added by Pierangelo Masarati. * Support for sambaPwdMustChange and sambaPwdCanChange added by Marco D'Ettorre. - * - * The conditions of the OpenLDAP Public License apply. */ #include diff --git a/contrib/slapd-modules/usn/README b/contrib/slapd-modules/usn/README index 05d1398313..372fdbb7b0 100644 --- a/contrib/slapd-modules/usn/README +++ b/contrib/slapd-modules/usn/README @@ -1,13 +1,3 @@ -Copyright 2007 Howard Chu, Symas Corp. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - -A copy of this license is available in the file LICENSE in the -top-level directory of the distribution or, alternatively, at -. - This directory contains a slapd overlay, usn, that extends slapd to maintain the usnCreated and usnChanged operational attributes normally used by Microsoft ActiveDirectory. @@ -36,3 +26,18 @@ If you need to build the overlay statically, you will have to move it into the slapd/overlays directory and edit the Makefile and overlays.c to reference it. You will also have to define SLAPD_OVER_USN to SLAPD_MOD_STATIC, and add the relevant libraries to the main slapd link command. + +--- +This work is part of OpenLDAP Software . + +Copyright 2007-2009 The OpenLDAP Foundation. +Portions Copyright 2007 Howard Chu, Symas Corp. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapd-tools/README b/contrib/slapd-tools/README index f3c6e62dfd..36cfdf39b9 100644 --- a/contrib/slapd-tools/README +++ b/contrib/slapd-tools/README @@ -1,12 +1,18 @@ +Directory contents: + +statslog + Program to output selected parts of slapd's statslog output + (LDAP request/response log), grouping log lines by LDAP + connection. Useful to search and inspect the server log. + +--- Copyright 2004-2009 The OpenLDAP Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted only as authorized by the OpenLDAP Public License. -Directory contents: +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. -statslog - Program to output selected parts of slapd's statslog output - (LDAP request/response log), grouping log lines by LDAP - connection. Useful to search and inspect the server log. diff --git a/contrib/slapd-tools/statslog b/contrib/slapd-tools/statslog index 2a49d7fbfd..2e52212546 100755 --- a/contrib/slapd-tools/statslog +++ b/contrib/slapd-tools/statslog @@ -1,8 +1,10 @@ #!/usr/bin/perl -w # statslog - Rearrange and output selected parts of slapd's statslog output. # $OpenLDAP$ +# This work is part of OpenLDAP Software . # -# Copyright 2004 Hallvard B. Furuseth. +# Copyright 1998-2009 The OpenLDAP Foundation. +# Portions Copyright 2004 Hallvard B. Furuseth. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/contrib/slapi-plugins/addrdnvalues/README b/contrib/slapi-plugins/addrdnvalues/README index 5f7208b415..a159d55dbf 100644 --- a/contrib/slapi-plugins/addrdnvalues/README +++ b/contrib/slapi-plugins/addrdnvalues/README @@ -1,9 +1,3 @@ -Copyright 2003-2009 The OpenLDAP Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted only as authorized by the OpenLDAP -Public License. - This directory contains a SLAPI plugin, addrdnvalues, which will add to an entry any attribute values that appear in the entry's RDN but not in the entry. This is necessary for compliance with some "broken" clients. @@ -20,3 +14,16 @@ gcc -shared -I../../../include -Wall -g -o libaddrdnvalues-plugin.so addrdnvalue to compile this plugin. +--- +This work is part of OpenLDAP Software . + +Copyright 2003-2009 The OpenLDAP Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted only as authorized by the OpenLDAP +Public License. + +A copy of this license is available in the file LICENSE in the +top-level directory of the distribution or, alternatively, at +. + diff --git a/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c b/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c index aecec9cf63..a43ac19f0b 100644 --- a/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c +++ b/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c @@ -1,5 +1,8 @@ +/* addrdnvalues.c */ /* $OpenLDAP$ */ -/* +/* This work is part of OpenLDAP Software . + * + * Copyright 2003-2009 The OpenLDAP Foundation. * Copyright 2003-2004 PADL Software Pty Ltd. * All rights reserved. * @@ -11,6 +14,10 @@ * top-level directory of the distribution or, alternatively, at * . */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by Luke Howard of PADL Software + * for inclusion in OpenLDAP Software. + */ #include #include